Revision

39645

Author

ryandesign@macports.org

Date

2008-08-27 14:17:13 -0700 (Wed, 27 Aug 2008)

Log Message

dcraw: now do the destroot for the dcraw binary in the Makefile too

Modified Paths

• trunk/dports/graphics/dcraw/Portfile
• trunk/dports/graphics/dcraw/files/Makefile.in

Diff

--- trunk/dports/graphics/dcraw/Portfile	2008-08-27 20:57:01 UTC (rev 39644)
+++ trunk/dports/graphics/dcraw/Portfile	2008-08-27 21:17:13 UTC (rev 39645)
@@ -33,6 +33,8 @@
 
 post-extract {
     xinstall -W ${filespath} Makefile.in ${worksrcpath}/Makefile
+    # Move "install" script; it conflicts with the destroot phase ("make install")
+    move ${worksrcpath}/install ${worksrcpath}/install.sh
 }
 
 # configure.cc doesn't get set until the default configure phase runs
@@ -46,8 +48,7 @@
     reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/Makefile
 }
 
-destroot {
-    xinstall -s -m 755 -W ${worksrcpath} dcraw ${destroot}${prefix}/bin
+post-destroot {
     xinstall -m 644 -W ${worksrcpath} dcraw.1 ${destroot}${prefix}/share/man/man1
     foreach lang {eo ru fr it de pt es zh_TW zh_CN nl pl hu} {
         if {[file exist ${worksrcpath}/dcraw_${lang}.1]} {

--- trunk/dports/graphics/dcraw/files/Makefile.in	2008-08-27 20:57:01 UTC (rev 39644)
+++ trunk/dports/graphics/dcraw/files/Makefile.in	2008-08-27 21:17:13 UTC (rev 39645)
@@ -8,3 +8,6 @@
 
 dcraw:
 	$(CC) -o dcraw $(CFLAGS) dcraw.c -ljpeg -llcms -lintl -liconv $(CPPFLAGS) $(LDFLAGS) -DLOCALEDIR=\"$(PREFIX)/share/locale/\"
+
+install:
+	install -s -m 755 dcraw $(DESTDIR)$(PREFIX)/bin