diff options
| author | minskim <minskim@pkgsrc.org> | 2006-03-18 00:54:28 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2006-03-18 00:54:28 +0000 |
| commit | 1dbe1049058e91640216bccdc7e040c085ef1506 (patch) | |
| tree | feea1596e8e868e56a32711372c51906f4ec66c5 /devel/libFoundation | |
| parent | 6ac1952a7c4173e2c5107cb84e9ffe4e9ceee30e (diff) | |
| download | pkgsrc-1dbe1049058e91640216bccdc7e040c085ef1506.tar.gz | |
Make directory names in PLIST match with those created by "make install".
Diffstat (limited to 'devel/libFoundation')
| -rw-r--r-- | devel/libFoundation/Makefile | 7 | ||||
| -rw-r--r-- | devel/libFoundation/PLIST | 10 |
2 files changed, 9 insertions, 8 deletions
diff --git a/devel/libFoundation/Makefile b/devel/libFoundation/Makefile index e1af51de0a4..7c7aca1205c 100644 --- a/devel/libFoundation/Makefile +++ b/devel/libFoundation/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/03/04 21:29:16 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2006/03/18 00:54:28 minskim Exp $ # DISTNAME= libFoundation-1.0.72-r107 @@ -20,6 +20,7 @@ MAKE_ENV+= FOUNDATION_LIB="fd" MAKE_ENV+= INSTALL_DATA=${INSTALL_DATA:Q} PLIST_SUBST+= GNUSTEP_HOST_CPU=${GNUSTEP_HOST_CPU:Q} +PLIST_SUBST+= LIBF_HOST_OS=${LIBF_HOST_OS} LIBF_HOST_OS= ${GNUSTEP_HOST:C/.*-//} @@ -32,10 +33,10 @@ pre-configure: post-configure: -${MKDIR} ${WRKSRC}/Foundation/${GNUSTEP_HOST_CPU} - [ -e ${WRKSRC}/Foundation/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS} ] || \ + [ -e ${WRKSRC}/Foundation/${GNUSTEP_HOST_CPU}/${LIBF_HOST_OS} ] || \ ${LN} -s \ ${WRKSRC}/Foundation/${LIBF_HOST_OS} \ - ${WRKSRC}/Foundation/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS} + ${WRKSRC}/Foundation/${GNUSTEP_HOST_CPU}/${LIBF_HOST_OS} .include "../../devel/gnustep-objc-lf2/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/devel/libFoundation/PLIST b/devel/libFoundation/PLIST index 8030f6a6e0a..aa687e11aa2 100644 --- a/devel/libFoundation/PLIST +++ b/devel/libFoundation/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2005/04/24 02:48:06 rh Exp $ +@comment $NetBSD: PLIST,v 1.2 2006/03/18 00:54:28 minskim Exp $ share/GNUstep/System/Libraries/Resources/libFoundation/CharacterSets/alphanumericCharacterSet.bitmap share/GNUstep/System/Libraries/Resources/libFoundation/CharacterSets/controlCharacterSet.bitmap share/GNUstep/System/Libraries/Resources/libFoundation/CharacterSets/decimalDigitCharacterSet.bitmap @@ -135,8 +135,8 @@ share/GNUstep/System/Libraries/Resources/libFoundation/TimeZoneInfo/UTC share/GNUstep/System/Libraries/Resources/libFoundation/TimeZoneInfo/Universal share/GNUstep/System/Libraries/Resources/libFoundation/TimeZoneInfo/W-SU share/GNUstep/System/Libraries/Resources/libFoundation/TimeZoneInfo/WET -share/GNUstep/System/Library/Headers/libFoundation/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}/GNU/lfmemory.h -share/GNUstep/System/Library/Headers/libFoundation/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}/GNU/real_exception_file.h +share/GNUstep/System/Library/Headers/libFoundation/${GNUSTEP_HOST_CPU}/${LIBF_HOST_OS}/GNU/lfmemory.h +share/GNUstep/System/Library/Headers/libFoundation/${GNUSTEP_HOST_CPU}/${LIBF_HOST_OS}/GNU/real_exception_file.h share/GNUstep/System/Library/Headers/libFoundation/Foundation/Foundation.h share/GNUstep/System/Library/Headers/libFoundation/Foundation/NSAccount.h share/GNUstep/System/Library/Headers/libFoundation/Foundation/NSAllocDebugZone.h @@ -252,8 +252,8 @@ share/GNUstep/System/Tools/Defaults @comment in devel/gnustep-make: @dirrm share/GNUstep/System/Tools @comment in devel/gnustep-make: @dirrm share/GNUstep/System/Library/Makefiles/Additional @comment in devel/gnustep-make: @dirrm share/GNUstep/System/Library/Libraries -@dirrm share/GNUstep/System/Library/Headers/libFoundation/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}/GNU -@dirrm share/GNUstep/System/Library/Headers/libFoundation/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS} +@dirrm share/GNUstep/System/Library/Headers/libFoundation/${GNUSTEP_HOST_CPU}/${LIBF_HOST_OS}/GNU +@dirrm share/GNUstep/System/Library/Headers/libFoundation/${GNUSTEP_HOST_CPU}/${LIBF_HOST_OS} @dirrm share/GNUstep/System/Library/Headers/libFoundation/${GNUSTEP_HOST_CPU} @dirrm share/GNUstep/System/Library/Headers/libFoundation/extensions/exceptions @dirrm share/GNUstep/System/Library/Headers/libFoundation/extensions |