diff options
author | steve <steve@FreeBSD.org> | 1998-09-27 20:59:17 +0000 |
---|---|---|
committer | steve <steve@FreeBSD.org> | 1998-09-27 20:59:17 +0000 |
commit | 14302585a4002f58947458fef68dbcdfb3c8a4e6 (patch) | |
tree | 61cf8ef6038e9560b413c2d7716a06d68841ecea | |
parent | d8af377c9f51f62c1626c4cb6951163bf4e405ff (diff) | |
download | FreeBSD-ports-14302585a4002f58947458fef68dbcdfb3c8a4e6.zip FreeBSD-ports-14302585a4002f58947458fef68dbcdfb3c8a4e6.tar.gz |
Convert to ELF.
-rw-r--r-- | x11-wm/windowmaker-i18n/Makefile | 14 | ||||
-rw-r--r-- | x11-wm/windowmaker-i18n/pkg-plist | 5 | ||||
-rw-r--r-- | x11-wm/windowmaker/Makefile | 14 | ||||
-rw-r--r-- | x11-wm/windowmaker/pkg-plist | 5 |
4 files changed, 28 insertions, 10 deletions
diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile index cd95bb8..53fc815 100644 --- a/x11-wm/windowmaker-i18n/Makefile +++ b/x11-wm/windowmaker-i18n/Makefile @@ -3,7 +3,7 @@ # Date created: August 13, 1997 # Whom: handy@physics.montana.edu # -# $Id: Makefile,v 1.31 1998/09/19 01:33:49 steve Exp $ +# $Id: Makefile,v 1.32 1998/09/24 15:13:35 tg Exp $ DISTNAME= WindowMaker-0.20.0 PKGNAME= windowmaker-0.20.0 @@ -43,9 +43,17 @@ pre-configure: INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; \ - make) + ${MAKE} ${MAKE_ENV}) pre-install: - @(cd ${WRKSRC}/libPropList; ${MAKE} install) + @(cd ${WRKSRC}/libPropList; ${MAKE} ${MAKE_ENV} install) + +post-install: + if [ "${PORTOBJFORMAT}" = "elf" ]; then \ + ${LN} -sf libPropList.so.0 ${PREFIX}/lib/libPropList.so; \ + else \ + ${LN} -sf libPropList.so.0.8 ${PREFIX}/lib/libPropList.so; \ + fi + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .include <bsd.port.mk> diff --git a/x11-wm/windowmaker-i18n/pkg-plist b/x11-wm/windowmaker-i18n/pkg-plist index f303b69..9b45d38 100644 --- a/x11-wm/windowmaker-i18n/pkg-plist +++ b/x11-wm/windowmaker-i18n/pkg-plist @@ -134,9 +134,10 @@ include/proplist.h include/wraster.h lib/libPropList.a @exec ranlib %D/%F +lib/libPropList.so lib/libPropList.so.0.8 -@exec /sbin/ldconfig -m %D -@unexec /sbin/ldconfig -m %D +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D lib/libWINGs.a @exec ranlib %D/%F lib/libWMaker.a diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile index cd95bb8..53fc815 100644 --- a/x11-wm/windowmaker/Makefile +++ b/x11-wm/windowmaker/Makefile @@ -3,7 +3,7 @@ # Date created: August 13, 1997 # Whom: handy@physics.montana.edu # -# $Id: Makefile,v 1.31 1998/09/19 01:33:49 steve Exp $ +# $Id: Makefile,v 1.32 1998/09/24 15:13:35 tg Exp $ DISTNAME= WindowMaker-0.20.0 PKGNAME= windowmaker-0.20.0 @@ -43,9 +43,17 @@ pre-configure: INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; \ - make) + ${MAKE} ${MAKE_ENV}) pre-install: - @(cd ${WRKSRC}/libPropList; ${MAKE} install) + @(cd ${WRKSRC}/libPropList; ${MAKE} ${MAKE_ENV} install) + +post-install: + if [ "${PORTOBJFORMAT}" = "elf" ]; then \ + ${LN} -sf libPropList.so.0 ${PREFIX}/lib/libPropList.so; \ + else \ + ${LN} -sf libPropList.so.0.8 ${PREFIX}/lib/libPropList.so; \ + fi + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .include <bsd.port.mk> diff --git a/x11-wm/windowmaker/pkg-plist b/x11-wm/windowmaker/pkg-plist index f303b69..9b45d38 100644 --- a/x11-wm/windowmaker/pkg-plist +++ b/x11-wm/windowmaker/pkg-plist @@ -134,9 +134,10 @@ include/proplist.h include/wraster.h lib/libPropList.a @exec ranlib %D/%F +lib/libPropList.so lib/libPropList.so.0.8 -@exec /sbin/ldconfig -m %D -@unexec /sbin/ldconfig -m %D +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D lib/libWINGs.a @exec ranlib %D/%F lib/libWMaker.a |