[csw-devel] SF.net SVN: gar:[7555] csw/mgar/pkg/gnupg2/trunk/Makefile

[wahwah at users.sourceforge.net]

Revision: 7555
          http://gar.svn.sourceforge.net/gar/?rev=7555&view=rev
Author:   wahwah
Date:     2009-12-04 17:51:22 +0000 (Fri, 04 Dec 2009)

Log Message:
-----------
gnupg2: post-merge target has to use PKGROOT

Modified Paths:
--------------
    csw/mgar/pkg/gnupg2/trunk/Makefile

Modified: csw/mgar/pkg/gnupg2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnupg2/trunk/Makefile	2009-12-04 17:47:14 UTC (rev 7554)
+++ csw/mgar/pkg/gnupg2/trunk/Makefile	2009-12-04 17:51:22 UTC (rev 7555)
@@ -37,8 +37,10 @@
 CONFIGURE_ARGS += --with-bzip2
 CONFIGURE_ARGS += --with-readline
 CONFIGURE_ARGS += --enable-threads=solaris
-CONFIGURE_ARGS += --with-pinentry-pgm=/opt/csw/bin/pinentry-curses
 
+# Waits for pinentry to be compiled on Solaris 8.
+# CONFIGURE_ARGS += --with-pinentry-pgm=/opt/csw/bin/pinentry-curses
+
 PROTOTYPE_FILTER = awk '$$$$3 ~/\/gpg2$$$$/ { $$$$4 = 4755 } { print }'
 
 # This is somehow not correctly detected from autoconf
@@ -49,7 +51,11 @@
 REQUIRED_PKGS  = CSWlibksba CSWgpgerr CSWgcrypt
 REQUIRED_PKGS += CSWcurlrt CSWoldaprt CSWzlib CSWpth CSWlibidn
 REQUIRED_PKGS += CSWbzip2 CSWreadline CSWggettextrt CSWiconv CSWosslrt
-REQUIRED_PKGS += CSWpinentry CSWlibassuan
+REQUIRED_PKGS += CSWlibassuan
+
+# Waits for pinentry to be compiled on Solaris 8.
+# REQUIRED_PKGS += CSWpinentry
+
 PREREQUISITE_PKGS  = $(REQUIRED_PKGS)
 
 INCOMPATIBLE_PKGS = CSWgnupg
@@ -59,5 +65,5 @@
 include gar/category.mk
 
 post-merge:
-	ln -s gnupg2 $(DESTDIR)$(bindir)/gnupg
+	ln -s gnupg2 $(PKGROOT)$(bindir)/gnupg
 	@$(MAKECOOKIE)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.