mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-26 23:54:01 +00:00
76 lines
2.3 KiB
Diff
76 lines
2.3 KiB
Diff
|
Index: makefile.src
|
||
|
|
===================================================================
|
||
|
|
--- makefile.src
|
||
|
|
+++ makefile.src
|
||
|
|
@@ -17,7 +17,7 @@ all: default
|
||
|
|
# clean deletes all but source, pristine (below) deletes installed stuff, too
|
||
|
|
default clean: doit
|
||
|
|
@for d in $(DIRS) ; do \
|
||
|
|
- ( cd $$d ; echo make $@ on $$d ; make $(MFLAGS) $@ ) ; \
|
||
|
|
+ ( cd $$d ; echo $(MAKE) $@ on $$d ; $(MAKE) $(MFLAGS) $@ ) ; \
|
||
|
|
done
|
||
|
|
|
||
|
|
# install puts library, binaries and documentation into global location
|
||
|
|
@@ -29,7 +29,7 @@ MAKE_TARGET =
|
||
|
|
|
||
|
|
install $(MAKE_TARGET) pristine depend:: doit
|
||
|
|
@for d in $(ALLDIRS) ; do \
|
||
|
|
- ( cd $$d ; echo make $@ on $$d ; make $(MFLAGS) $@ ) ; \
|
||
|
|
+ ( cd $$d ; echo $(MAKE) $@ on $$d ; $(MAKE) $(MFLAGS) $@ ) ; \
|
||
|
|
done
|
||
|
|
|
||
|
|
|
||
|
|
Index: tools/makefile.src
|
||
|
|
===================================================================
|
||
|
|
--- tools/makefile.src
|
||
|
|
+++ tools/makefile.src
|
||
|
|
@@ -82,7 +82,7 @@ rlebox.out: rlebox.c rle_box.o
|
||
|
|
# rleClock has it's own directory, must be built special
|
||
|
|
|
||
|
|
rleClock.out: clock/font.c clock/font.h clock/font.src clock/rleClock.c
|
||
|
|
- (cd clock ; make)
|
||
|
|
+ (cd clock ; $(MAKE))
|
||
|
|
|
||
|
|
# Incremental install, copies everything ("$?") since last install to DEST dir.
|
||
|
|
install: $(PGMS) install-pgm
|
||
|
|
Index: makefile.tlr
|
||
|
|
===================================================================
|
||
|
|
--- makefile.tlr
|
||
|
|
+++ makefile.tlr
|
||
|
|
@@ -7,7 +7,7 @@ subdirs:
|
||
|
|
@sh -c "if test 'x$(DIRS)' != x ; then eval \
|
||
|
|
'set -e ; for dir in $(DIRS) ; do \
|
||
|
|
(cd \$$dir ; echo Make ${HERE}\$$dir ; \
|
||
|
|
- make $(MFLAGS) $(DIRMFLAGS) ) ; \
|
||
|
|
+ $(MAKE) $(MFLAGS) $(DIRMFLAGS) ) ; \
|
||
|
|
done' ; \
|
||
|
|
else \
|
||
|
|
true ; \
|
||
|
|
@@ -46,7 +46,7 @@ install-subdirs: subdirs
|
||
|
|
@sh -c "if test 'x$(DIRS)' != x ; then eval \
|
||
|
|
'for dir in $(DIRS) ; do \
|
||
|
|
(cd \$$dir ; echo Install ${HERE}\$$dir ; \
|
||
|
|
- make $(MFLAGS) $(DIRMFLAGS) install) ; \
|
||
|
|
+ $(MAKE) $(MFLAGS) $(DIRMFLAGS) install) ; \
|
||
|
|
done' ; \
|
||
|
|
else \
|
||
|
|
true ; \
|
||
|
|
@@ -105,7 +105,7 @@ pristine-pgm: clean-pgm
|
||
|
|
'for dir in $(ALLDIRS); do \
|
||
|
|
if test -d $$dir ; then \
|
||
|
|
(cd $$dir; echo Make ${HERE}$$dir pristine ; \
|
||
|
|
- make $(MFLAGS) pristine); \
|
||
|
|
+ $(MAKE) $(MFLAGS) pristine); \
|
||
|
|
else \
|
||
|
|
true; \
|
||
|
|
fi; \
|
||
|
|
@@ -124,7 +124,7 @@ clean-pgm:
|
||
|
|
'for dir in $(ALLDIRS); do \
|
||
|
|
if test -d $$dir ; then \
|
||
|
|
(cd $$dir; echo Clean ${HERE}$$dir ; \
|
||
|
|
- make $(MFLAGS) clean); \
|
||
|
|
+ $(MAKE) $(MFLAGS) clean); \
|
||
|
|
else \
|
||
|
|
true; \
|
||
|
|
fi; \
|