diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-10-20 08:15:35 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-10-20 08:15:35 +0200 |
| commit | 380d23968d270a923c774bd8639110fee945696e (patch) | |
| tree | 1ba0ee579d5a13496985563db3cddbf733477775 /debian/patches/031_nx-X11_parallel-make.full.patch | |
| parent | 1e3d69216de360ac2400196316ab572776c7c2a8 (diff) | |
| download | nx-libs-380d23968d270a923c774bd8639110fee945696e.tar.gz nx-libs-380d23968d270a923c774bd8639110fee945696e.tar.bz2 nx-libs-380d23968d270a923c774bd8639110fee945696e.zip | |
Add patches: 024_fix-make-clean.full.patch, 024_fix-make-clean.full+lite.patch. Fix clean-up of build tree after make build has run.
Diffstat (limited to 'debian/patches/031_nx-X11_parallel-make.full.patch')
| -rw-r--r-- | debian/patches/031_nx-X11_parallel-make.full.patch | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/debian/patches/031_nx-X11_parallel-make.full.patch b/debian/patches/031_nx-X11_parallel-make.full.patch index 9f754d767..049b2130f 100644 --- a/debian/patches/031_nx-X11_parallel-make.full.patch +++ b/debian/patches/031_nx-X11_parallel-make.full.patch @@ -65,7 +65,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 @echo "" @date @echo "" -@@ -153,15 +153,15 @@ +@@ -154,15 +154,15 @@ -if exist xmakefile.bak del xmakefile.bak -if exist xmakefile ren xmakefile xmakefile.bak $(IMAKE:/=\) -s xmakefile -I$(IRULESRC) $(IMAKE_DEFINES) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) @@ -87,18 +87,23 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 @echo : @echo : @echo Full build of $(RELEASE) complete. -@@ -197,33 +197,33 @@ +@@ -198,38 +198,38 @@ # a copy of every rule that might be invoked at top level clean: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ +- -$(MAKE_CMD) $@ ++ -${MAKE_CMD} ${MAKE_OPTS} $@ + find config -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done + find lib -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done + find programs -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done + find include -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done + rm -f config/cf/{version.def,date.def} dangerous_strip_clean: - $(MAKE_CMD) $@ + ${MAKE} ${MAKE_OPTS} $@ distclean: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ +- -$(MAKE_CMD) $@ ++ -${MAKE} ${MAKE_OPTS} $@ $(RM) xmakefile $(IRULESRC)/version.def $(IRULESRC)/date.def depend: - $(MAKE_CMD) $@ |