[Midnightbsd-cvs] mports: bsd.mport.mk: workaround bug where prefix is already set before

ctriv at midnightbsd.org ctriv at midnightbsd.org
Sat Jan 3 22:19:35 EST 2009


Log Message:
-----------
workaround bug where prefix is already set before extensions are loaded. 
This should fix ports that have USE_LINUX_RPM set, but are installed in
LOCALBASE.

Modified Files:
--------------
    mports/Mk:
        bsd.mport.mk (r1.133 -> r1.134)

-------------- next part --------------
Index: bsd.mport.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.mport.mk,v
retrieving revision 1.133
retrieving revision 1.134
diff -L Mk/bsd.mport.mk -L Mk/bsd.mport.mk -u -r1.133 -r1.134
--- Mk/bsd.mport.mk
+++ Mk/bsd.mport.mk
@@ -58,7 +58,9 @@
 
 .if defined(USE_X_PREFIX) || defined(USE_IMAKE)
 PREFIX?=	${X11BASE_REL}
-.elif defined(USE_LINUX_PREFIX)
+# sadly, we have to use a little hack here.  Once linux-rpm.mk is loaded, this 
+# will already have been evaluated. XXX - Find a better fix in the future.
+.elif defined(USE_LINUX_PREFIX) || defined(USE_LINUX_RPM)
 PREFIX?=	${LINUXBASE_REL}
 .else
 PREFIX?=	${LOCALBASE_REL}


More information about the Midnightbsd-cvs mailing list