[76866] trunk/dports/lang/lua

[and.damore at macports.org]

Revision: 76866
          http://trac.macports.org/changeset/76866
Author:   and.damore at macports.org
Date:     2011-03-11 07:44:00 -0800 (Fri, 11 Mar 2011)
Log Message:
-----------
fixed liblua internal install path as per #28726, closing ticket

Modified Paths:
--------------
    trunk/dports/lang/lua/Portfile
    trunk/dports/lang/lua/files/patch-dlopen.diff

Modified: trunk/dports/lang/lua/Portfile
===================================================================
--- trunk/dports/lang/lua/Portfile	2011-03-11 09:40:09 UTC (rev 76865)
+++ trunk/dports/lang/lua/Portfile	2011-03-11 15:44:00 UTC (rev 76866)
@@ -37,6 +37,9 @@
     reinplace "s|%COMPAT_VERSION%|${compat_version}|g" ${worksrcpath}/Makefile
     reinplace "s|%COMPAT_VERSION%|${compat_version}|g" ${worksrcpath}/src/Makefile
     
+    # reinplace %PREFIX% to fix @executable_path, cf. ticket no. 28726
+    reinplace "s|%PREFIX%|${prefix}|g" ${worksrcpath}/src/Makefile
+
     # for the pkgconfig file
     reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/etc/lua.pc
 }

Modified: trunk/dports/lang/lua/files/patch-dlopen.diff
===================================================================
--- trunk/dports/lang/lua/files/patch-dlopen.diff	2011-03-11 09:40:09 UTC (rev 76865)
+++ trunk/dports/lang/lua/files/patch-dlopen.diff	2011-03-11 15:44:00 UTC (rev 76866)
@@ -35,7 +35,7 @@
  $(LUA_A): $(CORE_O) $(LIB_O)
  	$(AR) $@ $?
  	$(RANLIB) $@
-+	$(CC) -dynamiclib -install_name @executable_path/../lib/liblua.%COMPAT_VERSION%.dylib \
++	$(CC) -dynamiclib -install_name %PREFIX%/lib/liblua.%COMPAT_VERSION%.dylib \
 +		-compatibility_version %COMPAT_VERSION% -current_version %VERSION% \
 +		-o liblua.%VERSION%.dylib $^
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110311/14ec5fcb/attachment.html>