[24790] trunk/dports/devel/cook

source_changes at macosforge.org source_changes at macosforge.org
Fri May 4 02:01:18 PDT 2007


Revision: 24790
          http://trac.macosforge.org/projects/macports/changeset/24790
Author:   boeyms at macports.org
Date:     2007-05-04 02:01:17 -0700 (Fri, 04 May 2007)

Log Message:
-----------
devel/cook:
 * patch Makefile.in and change Portfile so that hardcoded paths that cook uses
   to locate its default data directories are correct, while still destrooting
   as MacPorts expects.

Modified Paths:
--------------
    trunk/dports/devel/cook/Portfile
    trunk/dports/devel/cook/files/patch-Makefile.in

Modified: trunk/dports/devel/cook/Portfile
===================================================================
--- trunk/dports/devel/cook/Portfile	2007-05-04 08:31:12 UTC (rev 24789)
+++ trunk/dports/devel/cook/Portfile	2007-05-04 09:01:17 UTC (rev 24790)
@@ -19,9 +19,8 @@
 checksums	md5 548cfcfe4121a03fc9203f9491fb5a64
 patchfiles	patch-Makefile.in patch-common__help.c
 pre-configure {
-	reinplace "s|\$(RPM_BUILD_ROOT)|${destroot}|g" \
-	   "${worksrcpath}/Makefile.in"
 	reinplace "s|__PREFIX__|${prefix}|g" \
 		"${worksrcpath}/common/help.c"
 }
-configure.args  --infodir=${prefix}/share/info --mandir=${prefix}/share/man
+configure.args  --infodir=${prefix}/share/info --mandir=${prefix}/share/man \
+                --datadir=${prefix}/share

Modified: trunk/dports/devel/cook/files/patch-Makefile.in
===================================================================
--- trunk/dports/devel/cook/files/patch-Makefile.in	2007-05-04 08:31:12 UTC (rev 24789)
+++ trunk/dports/devel/cook/files/patch-Makefile.in	2007-05-04 09:01:17 UTC (rev 24790)
@@ -1,5 +1,5 @@
 --- Makefile.in	2007-03-18 21:58:15.000000000 +0000
-+++ Makefile.in.new	2007-05-03 12:00:57.000000000 +0000
++++ Makefile.in.new	2007-05-04 08:43:50.000000000 +0000
 @@ -197,15 +197,15 @@
  		common/error_intl.h common/sub.h common/noreturn.h \
  		common/mem.h c_incl/os_interface.h common/progname.h \
@@ -2960,7 +2960,7 @@
  
  fstrcmp/main.$(OBJEXT): fstrcmp/main.c common/ac/stdio.h common/config.h \
  		common/config.messy.h common/ac/stdlib.h common/arglex.h \
-@@ -2924,20 +2924,20 @@
+@@ -2924,137 +2924,137 @@
  		common/format_print.h common/noreturn.h common/fstrcmp.h \
  		common/help.h common/progname.h common/str.h \
  		common/ac/stddef.h common/ac/stdarg.h common/version.h
@@ -2971,109 +2971,148 @@
  
  $(datadir)/as: lib/as lib/.datadir
 -  $(INSTALL_DATA) lib/as $@
-+	$(INSTALL_DATA) lib/as $@
++	$(INSTALL_DATA) lib/as $(DESTDIR)$@
  
  $(datadir)/bison: lib/bison lib/.datadir
 -  $(INSTALL_DATA) lib/bison $@
-+	$(INSTALL_DATA) lib/bison $@
++	$(INSTALL_DATA) lib/bison $(DESTDIR)$@
  
  $(datadir)/c: lib/c lib/.datadir
 -  $(INSTALL_DATA) lib/c $@
-+	$(INSTALL_DATA) lib/c $@
++	$(INSTALL_DATA) lib/c $(DESTDIR)$@
  
  $(datadir)/c++: lib/c++ lib/.datadir
 -  $(INSTALL_DATA) lib/c++ $@
-+	$(INSTALL_DATA) lib/c++ $@
++	$(INSTALL_DATA) lib/c++ $(DESTDIR)$@
  
  lib/en/LC_MESSAGES/c_incl.mo: lib/en/LC_MESSAGES/c_incl.po \
  		lib/en/LC_MESSAGES/common.po etc/msgfmt.sh
-@@ -2948,7 +2948,7 @@
+-sh etc/msgfmt.sh --msgfmt=$(MSGFMT) --msgcat=$(MSGCAT) \
++	sh etc/msgfmt.sh --msgfmt=$(MSGFMT) --msgcat=$(MSGCAT) \
+ 		--output=lib/en/LC_MESSAGES/c_incl.mo \
+ 		lib/en/LC_MESSAGES/c_incl.po \
+ 		lib/en/LC_MESSAGES/common.po
  
  $(libdir)/en/LC_MESSAGES/c_incl.mo: lib/en/LC_MESSAGES/c_incl.mo \
  		lib/en/LC_MESSAGES/.libdir
 -  $(INSTALL_DATA) lib/en/LC_MESSAGES/c_incl.mo $@
-+	$(INSTALL_DATA) lib/en/LC_MESSAGES/c_incl.mo $@
++	$(INSTALL_DATA) lib/en/LC_MESSAGES/c_incl.mo $(DESTDIR)$@
  
  lib/en/LC_MESSAGES/cook.mo: lib/en/LC_MESSAGES/cook.po \
  		lib/en/LC_MESSAGES/common.po etc/msgfmt.sh
-@@ -2958,7 +2958,7 @@
+-sh etc/msgfmt.sh --msgfmt=$(MSGFMT) --msgcat=$(MSGCAT) \
++	sh etc/msgfmt.sh --msgfmt=$(MSGFMT) --msgcat=$(MSGCAT) \
+ 		--output=lib/en/LC_MESSAGES/cook.mo \
+ 		lib/en/LC_MESSAGES/cook.po lib/en/LC_MESSAGES/common.po
  
  $(libdir)/en/LC_MESSAGES/cook.mo: lib/en/LC_MESSAGES/cook.mo \
  		lib/en/LC_MESSAGES/.libdir
 -  $(INSTALL_DATA) lib/en/LC_MESSAGES/cook.mo $@
-+	$(INSTALL_DATA) lib/en/LC_MESSAGES/cook.mo $@
++	$(INSTALL_DATA) lib/en/LC_MESSAGES/cook.mo $(DESTDIR)$@
  
  lib/en/LC_MESSAGES/cook_bom.mo: lib/en/LC_MESSAGES/cook_bom.po \
  		lib/en/LC_MESSAGES/common.po etc/msgfmt.sh
-@@ -2969,7 +2969,7 @@
+-sh etc/msgfmt.sh --msgfmt=$(MSGFMT) --msgcat=$(MSGCAT) \
++	sh etc/msgfmt.sh --msgfmt=$(MSGFMT) --msgcat=$(MSGCAT) \
+ 		--output=lib/en/LC_MESSAGES/cook_bom.mo \
+ 		lib/en/LC_MESSAGES/cook_bom.po \
+ 		lib/en/LC_MESSAGES/common.po
  
  $(libdir)/en/LC_MESSAGES/cook_bom.mo: lib/en/LC_MESSAGES/cook_bom.mo \
  		lib/en/LC_MESSAGES/.libdir
 -  $(INSTALL_DATA) lib/en/LC_MESSAGES/cook_bom.mo $@
-+	$(INSTALL_DATA) lib/en/LC_MESSAGES/cook_bom.mo $@
++	$(INSTALL_DATA) lib/en/LC_MESSAGES/cook_bom.mo $(DESTDIR)$@
  
  lib/en/LC_MESSAGES/cookfp.mo: lib/en/LC_MESSAGES/cookfp.po \
  		lib/en/LC_MESSAGES/common.po etc/msgfmt.sh
-@@ -2980,7 +2980,7 @@
+-sh etc/msgfmt.sh --msgfmt=$(MSGFMT) --msgcat=$(MSGCAT) \
++	sh etc/msgfmt.sh --msgfmt=$(MSGFMT) --msgcat=$(MSGCAT) \
+ 		--output=lib/en/LC_MESSAGES/cookfp.mo \
+ 		lib/en/LC_MESSAGES/cookfp.po \
+ 		lib/en/LC_MESSAGES/common.po
  
  $(libdir)/en/LC_MESSAGES/cookfp.mo: lib/en/LC_MESSAGES/cookfp.mo \
  		lib/en/LC_MESSAGES/.libdir
 -  $(INSTALL_DATA) lib/en/LC_MESSAGES/cookfp.mo $@
-+	$(INSTALL_DATA) lib/en/LC_MESSAGES/cookfp.mo $@
++	$(INSTALL_DATA) lib/en/LC_MESSAGES/cookfp.mo $(DESTDIR)$@
  
  lib/en/LC_MESSAGES/cooktime.mo: lib/en/LC_MESSAGES/cooktime.po \
  		lib/en/LC_MESSAGES/common.po etc/msgfmt.sh
-@@ -2991,7 +2991,7 @@
+-sh etc/msgfmt.sh --msgfmt=$(MSGFMT) --msgcat=$(MSGCAT) \
++	sh etc/msgfmt.sh --msgfmt=$(MSGFMT) --msgcat=$(MSGCAT) \
+ 		--output=lib/en/LC_MESSAGES/cooktime.mo \
+ 		lib/en/LC_MESSAGES/cooktime.po \
+ 		lib/en/LC_MESSAGES/common.po
  
  $(libdir)/en/LC_MESSAGES/cooktime.mo: lib/en/LC_MESSAGES/cooktime.mo \
  		lib/en/LC_MESSAGES/.libdir
 -  $(INSTALL_DATA) lib/en/LC_MESSAGES/cooktime.mo $@
-+	$(INSTALL_DATA) lib/en/LC_MESSAGES/cooktime.mo $@
++	$(INSTALL_DATA) lib/en/LC_MESSAGES/cooktime.mo $(DESTDIR)$@
  
  lib/en/LC_MESSAGES/file_check.mo: lib/en/LC_MESSAGES/file_check.po \
  		lib/en/LC_MESSAGES/common.po etc/msgfmt.sh
-@@ -3002,7 +3002,7 @@
+-sh etc/msgfmt.sh --msgfmt=$(MSGFMT) --msgcat=$(MSGCAT) \
++	sh etc/msgfmt.sh --msgfmt=$(MSGFMT) --msgcat=$(MSGCAT) \
+ 		--output=lib/en/LC_MESSAGES/file_check.mo \
+ 		lib/en/LC_MESSAGES/file_check.po \
+ 		lib/en/LC_MESSAGES/common.po
  
  $(libdir)/en/LC_MESSAGES/file_check.mo: lib/en/LC_MESSAGES/file_check.mo \
  		lib/en/LC_MESSAGES/.libdir
 -  $(INSTALL_DATA) lib/en/LC_MESSAGES/file_check.mo $@
-+	$(INSTALL_DATA) lib/en/LC_MESSAGES/file_check.mo $@
++	$(INSTALL_DATA) lib/en/LC_MESSAGES/file_check.mo $(DESTDIR)$@
  
  lib/en/LC_MESSAGES/find_libs.mo: lib/en/LC_MESSAGES/find_libs.po \
  		lib/en/LC_MESSAGES/common.po etc/msgfmt.sh
-@@ -3013,7 +3013,7 @@
+-sh etc/msgfmt.sh --msgfmt=$(MSGFMT) --msgcat=$(MSGCAT) \
++	sh etc/msgfmt.sh --msgfmt=$(MSGFMT) --msgcat=$(MSGCAT) \
+ 		--output=lib/en/LC_MESSAGES/find_libs.mo \
+ 		lib/en/LC_MESSAGES/find_libs.po \
+ 		lib/en/LC_MESSAGES/common.po
  
  $(libdir)/en/LC_MESSAGES/find_libs.mo: lib/en/LC_MESSAGES/find_libs.mo \
  		lib/en/LC_MESSAGES/.libdir
 -  $(INSTALL_DATA) lib/en/LC_MESSAGES/find_libs.mo $@
-+	$(INSTALL_DATA) lib/en/LC_MESSAGES/find_libs.mo $@
++	$(INSTALL_DATA) lib/en/LC_MESSAGES/find_libs.mo $(DESTDIR)$@
  
  lib/en/LC_MESSAGES/fstrcmp.mo: lib/en/LC_MESSAGES/fstrcmp.po \
  		lib/en/LC_MESSAGES/common.po etc/msgfmt.sh
-@@ -3024,7 +3024,7 @@
+-sh etc/msgfmt.sh --msgfmt=$(MSGFMT) --msgcat=$(MSGCAT) \
++	sh etc/msgfmt.sh --msgfmt=$(MSGFMT) --msgcat=$(MSGCAT) \
+ 		--output=lib/en/LC_MESSAGES/fstrcmp.mo \
+ 		lib/en/LC_MESSAGES/fstrcmp.po \
+ 		lib/en/LC_MESSAGES/common.po
  
  $(libdir)/en/LC_MESSAGES/fstrcmp.mo: lib/en/LC_MESSAGES/fstrcmp.mo \
  		lib/en/LC_MESSAGES/.libdir
 -  $(INSTALL_DATA) lib/en/LC_MESSAGES/fstrcmp.mo $@
-+	$(INSTALL_DATA) lib/en/LC_MESSAGES/fstrcmp.mo $@
++	$(INSTALL_DATA) lib/en/LC_MESSAGES/fstrcmp.mo $(DESTDIR)$@
  
  lib/en/LC_MESSAGES/make2cook.mo: lib/en/LC_MESSAGES/make2cook.po \
  		lib/en/LC_MESSAGES/common.po etc/msgfmt.sh
-@@ -3035,7 +3035,7 @@
+-sh etc/msgfmt.sh --msgfmt=$(MSGFMT) --msgcat=$(MSGCAT) \
++	sh etc/msgfmt.sh --msgfmt=$(MSGFMT) --msgcat=$(MSGCAT) \
+ 		--output=lib/en/LC_MESSAGES/make2cook.mo \
+ 		lib/en/LC_MESSAGES/make2cook.po \
+ 		lib/en/LC_MESSAGES/common.po
  
  $(libdir)/en/LC_MESSAGES/make2cook.mo: lib/en/LC_MESSAGES/make2cook.mo \
  		lib/en/LC_MESSAGES/.libdir
 -  $(INSTALL_DATA) lib/en/LC_MESSAGES/make2cook.mo $@
-+	$(INSTALL_DATA) lib/en/LC_MESSAGES/make2cook.mo $@
++	$(INSTALL_DATA) lib/en/LC_MESSAGES/make2cook.mo $(DESTDIR)$@
  
  lib/en/LC_MESSAGES/roffpp.mo: lib/en/LC_MESSAGES/roffpp.po \
  		lib/en/LC_MESSAGES/common.po etc/msgfmt.sh
-@@ -3046,15 +3046,15 @@
+-sh etc/msgfmt.sh --msgfmt=$(MSGFMT) --msgcat=$(MSGCAT) \
++	sh etc/msgfmt.sh --msgfmt=$(MSGFMT) --msgcat=$(MSGCAT) \
+ 		--output=lib/en/LC_MESSAGES/roffpp.mo \
+ 		lib/en/LC_MESSAGES/roffpp.po \
+ 		lib/en/LC_MESSAGES/common.po
  
  $(libdir)/en/LC_MESSAGES/roffpp.mo: lib/en/LC_MESSAGES/roffpp.mo \
  		lib/en/LC_MESSAGES/.libdir
 -  $(INSTALL_DATA) lib/en/LC_MESSAGES/roffpp.mo $@
-+	$(INSTALL_DATA) lib/en/LC_MESSAGES/roffpp.mo $@
++	$(INSTALL_DATA) lib/en/LC_MESSAGES/roffpp.mo $(DESTDIR)$@
  
  $(datadir)/en/man1/c_incl.1: lib/en/man1/c_incl.1 bin/roffpp$(EXEEXT) \
  		lib/en/man1/.datadir lib/en/man1/z_name.so \
@@ -3083,7 +3122,7 @@
 -  $(INSTALL_DATA) tmp $@
 -  @rm -f tmp
 +	bin/roffpp$(EXEEXT) -Ilib/en/man1 -Ietc lib/en/man1/c_incl.1 > tmp
-+	$(INSTALL_DATA) tmp $@
++	$(INSTALL_DATA) tmp $(DESTDIR)$@
 +	@rm -f tmp
  
  $(mandir)/man1/c_incl.1: lib/$(MANLANG)/man1/c_incl.1 \
@@ -3097,7 +3136,7 @@
  		lib/$(MANLANG)/man1/c_incl.1 > tmp
 -  $(INSTALL_DATA) tmp $@
 -  @rm -f tmp
-+	$(INSTALL_DATA) tmp $@
++	$(INSTALL_DATA) tmp $(DESTDIR)$@
 +	@rm -f tmp
  
  $(datadir)/en/man1/cook.1: lib/en/man1/cook.1 bin/roffpp$(EXEEXT) \
@@ -3108,7 +3147,7 @@
 -  $(INSTALL_DATA) tmp $@
 -  @rm -f tmp
 +	bin/roffpp$(EXEEXT) -Ilib/en/man1 -Ietc lib/en/man1/cook.1 > tmp
-+	$(INSTALL_DATA) tmp $@
++	$(INSTALL_DATA) tmp $(DESTDIR)$@
 +	@rm -f tmp
  
  $(mandir)/man1/cook.1: lib/$(MANLANG)/man1/cook.1 bin/roffpp$(EXEEXT) \
@@ -3122,7 +3161,7 @@
  		lib/$(MANLANG)/man1/cook.1 > tmp
 -  $(INSTALL_DATA) tmp $@
 -  @rm -f tmp
-+	$(INSTALL_DATA) tmp $@
++	$(INSTALL_DATA) tmp $(DESTDIR)$@
 +	@rm -f tmp
  
  $(datadir)/en/man1/cook_bom.1: lib/en/man1/cook_bom.1 \
@@ -3134,7 +3173,7 @@
 -  $(INSTALL_DATA) tmp $@
 -  @rm -f tmp
 +	bin/roffpp$(EXEEXT) -Ilib/en/man1 -Ietc lib/en/man1/cook_bom.1 > tmp
-+	$(INSTALL_DATA) tmp $@
++	$(INSTALL_DATA) tmp $(DESTDIR)$@
 +	@rm -f tmp
  
  $(mandir)/man1/cook_bom.1: lib/$(MANLANG)/man1/cook_bom.1 \
@@ -3148,7 +3187,7 @@
  		lib/$(MANLANG)/man1/cook_bom.1 > tmp
 -  $(INSTALL_DATA) tmp $@
 -  @rm -f tmp
-+	$(INSTALL_DATA) tmp $@
++	$(INSTALL_DATA) tmp $(DESTDIR)$@
 +	@rm -f tmp
  
  $(datadir)/en/man1/cook_lic.1: lib/en/man1/cook_lic.1 \
@@ -3157,7 +3196,7 @@
 -  $(INSTALL_DATA) tmp $@
 -  @rm -f tmp
 +	bin/roffpp$(EXEEXT) -Ilib/en/man1 -Ietc lib/en/man1/cook_lic.1 > tmp
-+	$(INSTALL_DATA) tmp $@
++	$(INSTALL_DATA) tmp $(DESTDIR)$@
 +	@rm -f tmp
  
  $(mandir)/man1/cook_lic.1: lib/$(MANLANG)/man1/cook_lic.1 \
@@ -3167,7 +3206,7 @@
  		lib/$(MANLANG)/man1/cook_lic.1 > tmp
 -  $(INSTALL_DATA) tmp $@
 -  @rm -f tmp
-+	$(INSTALL_DATA) tmp $@
++	$(INSTALL_DATA) tmp $(DESTDIR)$@
 +	@rm -f tmp
  
  $(datadir)/en/man1/cook_rsh.1: lib/en/man1/cook_rsh.1 \
@@ -3177,7 +3216,7 @@
 -  $(INSTALL_DATA) tmp $@
 -  @rm -f tmp
 +	bin/roffpp$(EXEEXT) -Ilib/en/man1 -Ietc lib/en/man1/cook_rsh.1 > tmp
-+	$(INSTALL_DATA) tmp $@
++	$(INSTALL_DATA) tmp $(DESTDIR)$@
 +	@rm -f tmp
  
  $(mandir)/man1/cook_rsh.1: lib/$(MANLANG)/man1/cook_rsh.1 \
@@ -3188,7 +3227,7 @@
  		lib/$(MANLANG)/man1/cook_rsh.1 > tmp
 -  $(INSTALL_DATA) tmp $@
 -  @rm -f tmp
-+	$(INSTALL_DATA) tmp $@
++	$(INSTALL_DATA) tmp $(DESTDIR)$@
 +	@rm -f tmp
  
  $(datadir)/en/man1/cookfp.1: lib/en/man1/cookfp.1 bin/roffpp$(EXEEXT) \
@@ -3199,7 +3238,7 @@
 -  $(INSTALL_DATA) tmp $@
 -  @rm -f tmp
 +	bin/roffpp$(EXEEXT) -Ilib/en/man1 -Ietc lib/en/man1/cookfp.1 > tmp
-+	$(INSTALL_DATA) tmp $@
++	$(INSTALL_DATA) tmp $(DESTDIR)$@
 +	@rm -f tmp
  
  $(mandir)/man1/cookfp.1: lib/$(MANLANG)/man1/cookfp.1 \
@@ -3212,7 +3251,7 @@
  		lib/$(MANLANG)/man1/cookfp.1 > tmp
 -  $(INSTALL_DATA) tmp $@
 -  @rm -f tmp
-+	$(INSTALL_DATA) tmp $@
++	$(INSTALL_DATA) tmp $(DESTDIR)$@
 +	@rm -f tmp
  
  $(datadir)/en/man1/cooktime.1: lib/en/man1/cooktime.1 \
@@ -3224,7 +3263,7 @@
 -  $(INSTALL_DATA) tmp $@
 -  @rm -f tmp
 +	bin/roffpp$(EXEEXT) -Ilib/en/man1 -Ietc lib/en/man1/cooktime.1 > tmp
-+	$(INSTALL_DATA) tmp $@
++	$(INSTALL_DATA) tmp $(DESTDIR)$@
 +	@rm -f tmp
  
  $(mandir)/man1/cooktime.1: lib/$(MANLANG)/man1/cooktime.1 \
@@ -3238,7 +3277,7 @@
  		lib/$(MANLANG)/man1/cooktime.1 > tmp
 -  $(INSTALL_DATA) tmp $@
 -  @rm -f tmp
-+	$(INSTALL_DATA) tmp $@
++	$(INSTALL_DATA) tmp $(DESTDIR)$@
 +	@rm -f tmp
  
  $(datadir)/en/man1/find_libs.1: lib/en/man1/find_libs.1 \
@@ -3250,7 +3289,7 @@
 -  $(INSTALL_DATA) tmp $@
 -  @rm -f tmp
 +	bin/roffpp$(EXEEXT) -Ilib/en/man1 -Ietc lib/en/man1/find_libs.1 > tmp
-+	$(INSTALL_DATA) tmp $@
++	$(INSTALL_DATA) tmp $(DESTDIR)$@
 +	@rm -f tmp
  
  $(mandir)/man1/find_libs.1: lib/$(MANLANG)/man1/find_libs.1 \
@@ -3264,7 +3303,7 @@
  		lib/$(MANLANG)/man1/find_libs.1 > tmp
 -  $(INSTALL_DATA) tmp $@
 -  @rm -f tmp
-+	$(INSTALL_DATA) tmp $@
++	$(INSTALL_DATA) tmp $(DESTDIR)$@
 +	@rm -f tmp
  
  $(datadir)/en/man1/make2cook.1: lib/en/man1/make2cook.1 \
@@ -3276,7 +3315,7 @@
 -  $(INSTALL_DATA) tmp $@
 -  @rm -f tmp
 +	bin/roffpp$(EXEEXT) -Ilib/en/man1 -Ietc lib/en/man1/make2cook.1 > tmp
-+	$(INSTALL_DATA) tmp $@
++	$(INSTALL_DATA) tmp $(DESTDIR)$@
 +	@rm -f tmp
  
  $(mandir)/man1/make2cook.1: lib/$(MANLANG)/man1/make2cook.1 \
@@ -3290,7 +3329,7 @@
  		lib/$(MANLANG)/man1/make2cook.1 > tmp
 -  $(INSTALL_DATA) tmp $@
 -  @rm -f tmp
-+	$(INSTALL_DATA) tmp $@
++	$(INSTALL_DATA) tmp $(DESTDIR)$@
 +	@rm -f tmp
  
  $(datadir)/en/man1/roffpp.1: lib/en/man1/roffpp.1 bin/roffpp$(EXEEXT) \
@@ -3301,7 +3340,7 @@
 -  $(INSTALL_DATA) tmp $@
 -  @rm -f tmp
 +	bin/roffpp$(EXEEXT) -Ilib/en/man1 -Ietc lib/en/man1/roffpp.1 > tmp
-+	$(INSTALL_DATA) tmp $@
++	$(INSTALL_DATA) tmp $(DESTDIR)$@
 +	@rm -f tmp
  
  $(mandir)/man1/roffpp.1: lib/$(MANLANG)/man1/roffpp.1 \
@@ -3315,7 +3354,7 @@
  		lib/$(MANLANG)/man1/roffpp.1 > tmp
 -  $(INSTALL_DATA) tmp $@
 -  @rm -f tmp
-+	$(INSTALL_DATA) tmp $@
++	$(INSTALL_DATA) tmp $(DESTDIR)$@
 +	@rm -f tmp
  
  lib/en/refman.ps: lib/en/refman/main.man bin/roffpp$(EXEEXT) etc/toc.so \
@@ -3331,7 +3370,7 @@
  
  $(datadir)/en/refman.ps: lib/en/refman.ps lib/en/.datadir
 -  $(INSTALL_DATA) lib/en/refman.ps $@
-+	$(INSTALL_DATA) lib/en/refman.ps $@
++	$(INSTALL_DATA) lib/en/refman.ps $(DESTDIR)$@
  
  lib/en/refman.dvi: lib/en/refman/main.man bin/roffpp$(EXEEXT) etc/toc.so \
  		etc/version.so lib/en/readme/main.man \
@@ -3346,7 +3385,7 @@
  
  $(datadir)/en/refman.dvi: lib/en/refman.dvi lib/en/.datadir
 -  $(INSTALL_DATA) lib/en/refman.dvi $@
-+	$(INSTALL_DATA) lib/en/refman.dvi $@
++	$(INSTALL_DATA) lib/en/refman.dvi $(DESTDIR)$@
  
  lib/en/refman.txt: lib/en/refman/main.man bin/roffpp$(EXEEXT) etc/toc.so \
  		etc/version.so lib/en/readme/main.man \
@@ -3361,7 +3400,7 @@
  
  $(datadir)/en/refman.txt: lib/en/refman.txt lib/en/.datadir
 -  $(INSTALL_DATA) lib/en/refman.txt $@
-+	$(INSTALL_DATA) lib/en/refman.txt $@
++	$(INSTALL_DATA) lib/en/refman.txt $(DESTDIR)$@
  
  lib/en/tutorial.ps: lib/en/tutorial/main.mm bin/roffpp$(EXEEXT) \
  		etc/libdir.so etc/version.so lib/en/tutorial/fig1.so \
@@ -3373,7 +3412,7 @@
  
  $(datadir)/en/tutorial.ps: lib/en/tutorial.ps lib/en/.datadir
 -  $(INSTALL_DATA) lib/en/tutorial.ps $@
-+	$(INSTALL_DATA) lib/en/tutorial.ps $@
++	$(INSTALL_DATA) lib/en/tutorial.ps $(DESTDIR)$@
  
  lib/en/tutorial.dvi: lib/en/tutorial/main.mm bin/roffpp$(EXEEXT) \
  		etc/libdir.so etc/version.so lib/en/tutorial/fig1.so \
@@ -3385,7 +3424,7 @@
  
  $(datadir)/en/tutorial.dvi: lib/en/tutorial.dvi lib/en/.datadir
 -  $(INSTALL_DATA) lib/en/tutorial.dvi $@
-+	$(INSTALL_DATA) lib/en/tutorial.dvi $@
++	$(INSTALL_DATA) lib/en/tutorial.dvi $(DESTDIR)$@
  
  lib/en/tutorial.txt: lib/en/tutorial/main.mm bin/roffpp$(EXEEXT) \
  		etc/libdir.so etc/version.so lib/en/tutorial/fig1.so \
@@ -3397,7 +3436,7 @@
  
  $(datadir)/en/tutorial.txt: lib/en/tutorial.txt lib/en/.datadir
 -  $(INSTALL_DATA) lib/en/tutorial.txt $@
-+	$(INSTALL_DATA) lib/en/tutorial.txt $@
++	$(INSTALL_DATA) lib/en/tutorial.txt $(DESTDIR)$@
  
  lib/en/user-guide.ps: lib/en/user-guide/main.mm bin/roffpp$(EXEEXT) \
  		etc/libdir.so etc/version.so lib/en/user-guide/intro.so \
@@ -3412,7 +3451,7 @@
  
  $(datadir)/en/user-guide.ps: lib/en/user-guide.ps lib/en/.datadir
 -  $(INSTALL_DATA) lib/en/user-guide.ps $@
-+	$(INSTALL_DATA) lib/en/user-guide.ps $@
++	$(INSTALL_DATA) lib/en/user-guide.ps $(DESTDIR)$@
  
  lib/en/user-guide.dvi: lib/en/user-guide/main.mm bin/roffpp$(EXEEXT) \
  		etc/libdir.so etc/version.so lib/en/user-guide/intro.so \
@@ -3427,7 +3466,7 @@
  
  $(datadir)/en/user-guide.dvi: lib/en/user-guide.dvi lib/en/.datadir
 -  $(INSTALL_DATA) lib/en/user-guide.dvi $@
-+	$(INSTALL_DATA) lib/en/user-guide.dvi $@
++	$(INSTALL_DATA) lib/en/user-guide.dvi $(DESTDIR)$@
  
  lib/en/user-guide.txt: lib/en/user-guide/main.mm bin/roffpp$(EXEEXT) \
  		etc/libdir.so etc/version.so lib/en/user-guide/intro.so \
@@ -3442,83 +3481,83 @@
  
  $(datadir)/en/user-guide.txt: lib/en/user-guide.txt lib/en/.datadir
 -  $(INSTALL_DATA) lib/en/user-guide.txt $@
-+	$(INSTALL_DATA) lib/en/user-guide.txt $@
++	$(INSTALL_DATA) lib/en/user-guide.txt $(DESTDIR)$@
  
  $(datadir)/f77: lib/f77 lib/.datadir
 -  $(INSTALL_DATA) lib/f77 $@
-+	$(INSTALL_DATA) lib/f77 $@
++	$(INSTALL_DATA) lib/f77 $(DESTDIR)$@
  
  $(datadir)/functions: lib/functions lib/.datadir
 -  $(INSTALL_DATA) lib/functions $@
-+	$(INSTALL_DATA) lib/functions $@
++	$(INSTALL_DATA) lib/functions $(DESTDIR)$@
  
  $(datadir)/g77: lib/g77 lib/.datadir
 -  $(INSTALL_DATA) lib/g77 $@
-+	$(INSTALL_DATA) lib/g77 $@
++	$(INSTALL_DATA) lib/g77 $(DESTDIR)$@
  
  $(datadir)/gcc: lib/gcc lib/.datadir
 -  $(INSTALL_DATA) lib/gcc $@
-+	$(INSTALL_DATA) lib/gcc $@
++	$(INSTALL_DATA) lib/gcc $(DESTDIR)$@
  
  $(datadir)/home: lib/home lib/.datadir
 -  $(INSTALL_DATA) lib/home $@
-+	$(INSTALL_DATA) lib/home $@
++	$(INSTALL_DATA) lib/home $(DESTDIR)$@
  
  $(datadir)/host_lists.pl: lib/host_lists.pl lib/.datadir
 -  $(INSTALL_DATA) lib/host_lists.pl $@
-+	$(INSTALL_DATA) lib/host_lists.pl $@
++	$(INSTALL_DATA) lib/host_lists.pl $(DESTDIR)$@
  
  $(datadir)/java: lib/java lib/.datadir
 -  $(INSTALL_DATA) lib/java $@
-+	$(INSTALL_DATA) lib/java $@
++	$(INSTALL_DATA) lib/java $(DESTDIR)$@
  
  $(datadir)/lex: lib/lex lib/.datadir
 -  $(INSTALL_DATA) lib/lex $@
-+	$(INSTALL_DATA) lib/lex $@
++	$(INSTALL_DATA) lib/lex $(DESTDIR)$@
  
  $(datadir)/library: lib/library lib/.datadir
 -  $(INSTALL_DATA) lib/library $@
-+	$(INSTALL_DATA) lib/library $@
++	$(INSTALL_DATA) lib/library $(DESTDIR)$@
  
  $(datadir)/print: lib/print lib/.datadir
 -  $(INSTALL_DATA) lib/print $@
-+	$(INSTALL_DATA) lib/print $@
++	$(INSTALL_DATA) lib/print $(DESTDIR)$@
  
  $(datadir)/program: lib/program lib/.datadir
 -  $(INSTALL_DATA) lib/program $@
-+	$(INSTALL_DATA) lib/program $@
++	$(INSTALL_DATA) lib/program $(DESTDIR)$@
  
  $(datadir)/rcs: lib/rcs lib/.datadir
 -  $(INSTALL_DATA) lib/rcs $@
-+	$(INSTALL_DATA) lib/rcs $@
++	$(INSTALL_DATA) lib/rcs $(DESTDIR)$@
  
  $(datadir)/recursive: lib/recursive lib/.datadir
 -  $(INSTALL_DATA) lib/recursive $@
-+	$(INSTALL_DATA) lib/recursive $@
++	$(INSTALL_DATA) lib/recursive $(DESTDIR)$@
  
  $(datadir)/sccs: lib/sccs lib/.datadir
 -  $(INSTALL_DATA) lib/sccs $@
-+	$(INSTALL_DATA) lib/sccs $@
++	$(INSTALL_DATA) lib/sccs $(DESTDIR)$@
  
  $(datadir)/text: lib/text lib/.datadir
 -  $(INSTALL_DATA) lib/text $@
-+	$(INSTALL_DATA) lib/text $@
++	$(INSTALL_DATA) lib/text $(DESTDIR)$@
  
  $(datadir)/usr: lib/usr lib/.datadir
 -  $(INSTALL_DATA) lib/usr $@
-+	$(INSTALL_DATA) lib/usr $@
++	$(INSTALL_DATA) lib/usr $(DESTDIR)$@
  
  $(datadir)/usr.local: lib/usr.local lib/.datadir
 -  $(INSTALL_DATA) lib/usr.local $@
-+	$(INSTALL_DATA) lib/usr.local $@
++	$(INSTALL_DATA) lib/usr.local $(DESTDIR)$@
  
  $(datadir)/yacc: lib/yacc lib/.datadir
 -  $(INSTALL_DATA) lib/yacc $@
-+	$(INSTALL_DATA) lib/yacc $@
++	$(INSTALL_DATA) lib/yacc $(DESTDIR)$@
  
  $(datadir)/yacc_many: lib/yacc_many lib/.datadir
 -  $(INSTALL_DATA) lib/yacc_many $@
-+	$(INSTALL_DATA) lib/yacc_many $@
++	$(INSTALL_DATA) lib/yacc_many $(DESTDIR)$@
  
  make2cook/blob.$(OBJEXT): make2cook/blob.c make2cook/blob.h common/str.h \
  		common/ac/stddef.h common/config.h common/config.messy.h \
@@ -3796,7 +3835,7 @@
  $(bindir)/$(PROGRAM_PREFIX)cook_rsh$(PROGRAM_SUFFIX)$(EXEEXT): \
  		bin/cook_rsh$(EXEEXT) .bindir
 -  $(INSTALL_SCRIPT) bin/cook_rsh$(EXEEXT) $@
-+	$(INSTALL_SCRIPT) bin/cook_rsh$(EXEEXT) $@
++	$(INSTALL_SCRIPT) bin/cook_rsh$(EXEEXT) $(DESTDIR)$@
  
  t0001a: test/00/t0001a.sh all
 -  CC="$(CC)" $(SH) test/00/t0001a.sh
@@ -4606,7 +4645,7 @@
 -  -$(INSTALL) -m 0755 -d $(datadir)
 -  @-test -d $(datadir) && touch $@
 -  @sleep 1
-+	-$(INSTALL) -m 0755 -d $(datadir)
++	-$(INSTALL) -m 0755 -d $(DESTDIR)$(datadir)
 +	@-test -d $(datadir) && touch $@
 +	@sleep 1
  
@@ -4614,15 +4653,15 @@
 -  -$(INSTALL) -m 0755 -d $(libdir)/en/LC_MESSAGES
 -  @-test -d $(libdir)/en/LC_MESSAGES && touch $@
 -  @sleep 1
-+	-$(INSTALL) -m 0755 -d $(libdir)/en/LC_MESSAGES
-+	@-test -d $(libdir)/en/LC_MESSAGES && touch $@
++	-$(INSTALL) -m 0755 -d $(DESTDIR)$(libdir)/en/LC_MESSAGES
++	@-test -d $(DESTDIR)$(libdir)/en/LC_MESSAGES && touch $@
 +	@sleep 1
  
  lib/en/.libdir: lib/.libdir
 -  -$(INSTALL) -m 0755 -d $(libdir)/en
 -  @-test -d $(libdir)/en && touch $@
 -  @sleep 1
-+	-$(INSTALL) -m 0755 -d $(libdir)/en
++	-$(INSTALL) -m 0755 -d $(DESTDIR)$(libdir)/en
 +	@-test -d $(libdir)/en && touch $@
 +	@sleep 1
  
@@ -4630,7 +4669,7 @@
 -  -$(INSTALL) -m 0755 -d $(libdir)
 -  @-test -d $(libdir) && touch $@
 -  @sleep 1
-+	-$(INSTALL) -m 0755 -d $(libdir)
++	-$(INSTALL) -m 0755 -d $(DESTDIR)$(libdir)
 +	@-test -d $(libdir) && touch $@
 +	@sleep 1
  
@@ -4638,7 +4677,7 @@
 -  -$(INSTALL) -m 0755 -d $(mandir)/man1
 -  @-test -d $(mandir)/man1 && touch $@
 -  @sleep 1
-+	-$(INSTALL) -m 0755 -d $(mandir)/man1
++	-$(INSTALL) -m 0755 -d $(DESTDIR)$(mandir)/man1
 +	@-test -d $(mandir)/man1 && touch $@
 +	@sleep 1
  
@@ -4646,7 +4685,7 @@
 -  -$(INSTALL) -m 0755 -d $(mandir)
 -  @-test -d $(mandir) && touch $@
 -  @sleep 1
-+	-$(INSTALL) -m 0755 -d $(mandir)
++	-$(INSTALL) -m 0755 -d $(DESTDIR)$(mandir)
 +	@-test -d $(mandir) && touch $@
 +	@sleep 1
  
@@ -4654,7 +4693,7 @@
 -  -$(INSTALL) -m 0755 -d $(datadir)/en/man1
 -  @-test -d $(datadir)/en/man1 && touch $@
 -  @sleep 1
-+	-$(INSTALL) -m 0755 -d $(datadir)/en/man1
++	-$(INSTALL) -m 0755 -d $(DESTDIR)$(datadir)/en/man1
 +	@-test -d $(datadir)/en/man1 && touch $@
 +	@sleep 1
  
@@ -4662,7 +4701,7 @@
 -  -$(INSTALL) -m 0755 -d $(datadir)/en
 -  @-test -d $(datadir)/en && touch $@
 -  @sleep 1
-+	-$(INSTALL) -m 0755 -d $(datadir)/en
++	-$(INSTALL) -m 0755 -d $(DESTDIR)$(datadir)/en
 +	@-test -d $(datadir)/en && touch $@
 +	@sleep 1
  
@@ -4678,7 +4717,7 @@
  $(bindir)/$(PROGRAM_PREFIX)c_incl$(PROGRAM_SUFFIX)$(EXEEXT): \
  		bin/c_incl$(EXEEXT) .bindir
 -  $(INSTALL_PROGRAM) bin/c_incl$(EXEEXT) $@
-+	$(INSTALL_PROGRAM) bin/c_incl$(EXEEXT) $@
++	$(INSTALL_PROGRAM) bin/c_incl$(EXEEXT) $(DESTDIR)$@
  
  common_obj = common/ac/libintl.$(OBJEXT) common/ac/mntent.$(OBJEXT) \
  		common/ac/stdio.$(OBJEXT) common/ac/stdlib.$(OBJEXT) \
@@ -4692,7 +4731,7 @@
  $(bindir)/$(PROGRAM_PREFIX)cook$(PROGRAM_SUFFIX)$(EXEEXT): \
  		bin/cook$(EXEEXT) .bindir
 -  $(INSTALL_PROGRAM) bin/cook$(EXEEXT) $@
-+	$(INSTALL_PROGRAM) bin/cook$(EXEEXT) $@
++	$(INSTALL_PROGRAM) bin/cook$(EXEEXT) $(DESTDIR)$@
  
  cook_bom_obj = cook_bom/main.$(OBJEXT) cook_bom/sniff.$(OBJEXT)
  
@@ -4703,7 +4742,7 @@
  $(bindir)/$(PROGRAM_PREFIX)cook_bom$(PROGRAM_SUFFIX)$(EXEEXT): \
  		bin/cook_bom$(EXEEXT) .bindir
 -  $(INSTALL_PROGRAM) bin/cook_bom$(EXEEXT) $@
-+	$(INSTALL_PROGRAM) bin/cook_bom$(EXEEXT) $@
++	$(INSTALL_PROGRAM) bin/cook_bom$(EXEEXT) $(DESTDIR)$@
  
  cookfp_obj = cookfp/main.$(OBJEXT)
  
@@ -4714,7 +4753,7 @@
  $(bindir)/$(PROGRAM_PREFIX)cookfp$(PROGRAM_SUFFIX)$(EXEEXT): \
  		bin/cookfp$(EXEEXT) .bindir
 -  $(INSTALL_PROGRAM) bin/cookfp$(EXEEXT) $@
-+	$(INSTALL_PROGRAM) bin/cookfp$(EXEEXT) $@
++	$(INSTALL_PROGRAM) bin/cookfp$(EXEEXT) $(DESTDIR)$@
  
  cooktime_obj = cooktime/date.gen.$(OBJEXT) cooktime/main.$(OBJEXT)
  
@@ -4725,7 +4764,7 @@
  $(bindir)/$(PROGRAM_PREFIX)cooktime$(PROGRAM_SUFFIX)$(EXEEXT): \
  		bin/cooktime$(EXEEXT) .bindir
 -  $(INSTALL_PROGRAM) bin/cooktime$(EXEEXT) $@
-+	$(INSTALL_PROGRAM) bin/cooktime$(EXEEXT) $@
++	$(INSTALL_PROGRAM) bin/cooktime$(EXEEXT) $(DESTDIR)$@
  
  file_check_obj = file_check/file_check.$(OBJEXT) \
  		file_check/main.$(OBJEXT)
@@ -4743,7 +4782,7 @@
  $(bindir)/$(PROGRAM_PREFIX)find_libs$(PROGRAM_SUFFIX)$(EXEEXT): \
  		bin/find_libs$(EXEEXT) .bindir
 -  $(INSTALL_PROGRAM) bin/find_libs$(EXEEXT) $@
-+	$(INSTALL_PROGRAM) bin/find_libs$(EXEEXT) $@
++	$(INSTALL_PROGRAM) bin/find_libs$(EXEEXT) $(DESTDIR)$@
  
  fstrcmp_obj = fstrcmp/main.$(OBJEXT)
  
@@ -4763,7 +4802,7 @@
  $(bindir)/$(PROGRAM_PREFIX)make2cook$(PROGRAM_SUFFIX)$(EXEEXT): \
  		bin/make2cook$(EXEEXT) .bindir
 -  $(INSTALL_PROGRAM) bin/make2cook$(EXEEXT) $@
-+	$(INSTALL_PROGRAM) bin/make2cook$(EXEEXT) $@
++	$(INSTALL_PROGRAM) bin/make2cook$(EXEEXT) $(DESTDIR)$@
  
  roffpp_obj = roffpp/main.$(OBJEXT) roffpp/preprocess.$(OBJEXT)
  
@@ -4774,7 +4813,7 @@
  $(bindir)/$(PROGRAM_PREFIX)roffpp$(PROGRAM_SUFFIX)$(EXEEXT): \
  		bin/roffpp$(EXEEXT) .bindir
 -  $(INSTALL_PROGRAM) bin/roffpp$(EXEEXT) $@
-+	$(INSTALL_PROGRAM) bin/roffpp$(EXEEXT) $@
++	$(INSTALL_PROGRAM) bin/roffpp$(EXEEXT) $(DESTDIR)$@
  
  #
  # The real default target
@@ -4803,8 +4842,8 @@
 -  -$(INSTALL) -m 0755 -d $(bindir)
 -  @-test -d $(bindir) && touch .bindir
 -  @sleep 1
-+	-$(INSTALL) -m 0755 -d $(bindir)
-+	@-test -d $(bindir) && touch .bindir
++	-$(INSTALL) -m 0755 -d $(DESTDIR)$(bindir)
++	@-test -d $(DESTDIR)$(bindir) && touch .bindir
 +	@sleep 1
  
  sure: t0001a t0002a t0003a t0004a t0005a t0006a t0007a t0008a t0009a \

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070504/aa49293a/attachment.html


More information about the macports-changes mailing list