$NetBSD: patch-am,v 1.3 2007/05/28 20:14:00 heinz Exp $ --- makefile.tlr.orig 1992-08-04 19:17:57.000000000 +0200 +++ 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 ; \ @@ -18,8 +18,7 @@ install-pgm: $(PGMS) @sh -c "if test 'x$?' != x ; then eval \ 'for pgm in $? ; do \ dpgm=\`basename \$$pgm .out\` ; \ - echo cp \$$pgm $(DEST)/\$$dpgm ; \ - cp \$$pgm $(DEST)/\$$dpgm; \ + ${LIBTOOL} --mode=install cp \$$pgm $(DESTDIR)$(DEST)/\$$dpgm; \ done' ; \ else \ true ; \ @@ -31,10 +30,10 @@ install-script: $(SCRIPTS) @sh -c "if test 'x$?' != x ; then eval \ 'for pgm in $? ; do \ dpgm=\`basename \$$pgm .sh\` ; \ - echo cp \$$pgm $(DEST)/\$$dpgm ; \ - cp \$$pgm $(DEST)/\$$dpgm; \ - echo chmod a+rx $(DEST)/\$$dpgm ; \ - chmod a+rx $(DEST)/\$$dpgm; \ + echo cp \$$pgm $(DESTDIR)$(DEST)/\$$dpgm ; \ + cp \$$pgm $(DESTDIR)$(DEST)/\$$dpgm; \ + echo chmod a+rx $(DESTDIR)$(DEST)/\$$dpgm ; \ + chmod a+rx $(DESTDIR)$(DEST)/\$$dpgm; \ done' ; \ else \ true ; \ @@ -46,7 +45,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 ; \ @@ -86,8 +85,8 @@ pristine-pgm: clean-pgm @-if test 'x$(PGMS)' != x ; then eval \ 'for pgm in $(PGMS); do \ dpgm=`basename $$pgm .out`; \ - echo rm -f $(DEST)/$$dpgm; \ - rm -f $(DEST)/$$dpgm; \ + echo rm -f $(DESTDIR)$(DEST)/$$dpgm; \ + rm -f $(DESTDIR)$(DEST)/$$dpgm; \ done' ; \ else \ true ; \ @@ -95,8 +94,8 @@ pristine-pgm: clean-pgm @-if test 'x$(SCRIPTS)' != x ; then eval \ 'for pgm in $(SCRIPTS); do \ dpgm=`basename $$pgm .sh`; \ - echo rm -f $(DEST)/$$dpgm; \ - rm -f $(DEST)/$$dpgm; \ + echo rm -f $(DESTDIR)$(DEST)/$$dpgm; \ + rm -f $(DESTDIR)$(DEST)/$$dpgm; \ done' ; \ else \ true ; \ @@ -105,7 +104,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 +123,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; \