- flat layout

Approved by:	knu
This commit is contained in:
Dirk Meyer 2003-07-26 14:53:55 +00:00
parent dc54100df8
commit 39ac94bc84
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=85629
2 changed files with 16 additions and 10 deletions

View File

@ -47,15 +47,21 @@ GNUSTEP_NETWORK_ROOT= ${GNUSTEP_PREFIX}/Network
GNUSTEP_USER_ROOT= ${GNUSTEP_PREFIX}/Local/Users
GNUSTEP_MAKEFILES= ${GNUSTEP_SYSTEM_ROOT}/Makefiles
BACKBUNDLEDIR= ${GNUSTEP_PREFIX}/System/Library/Bundles/libgnustep-back.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/
.if defined(WITH_GNUSTEP_DEVEL)
SYSLIBDIR= ${GNUSTEP_PREFIX}/System/Library/Libraries/${GNU_ARCH}/${OPSYS:L}
BACKBUNDLEDIR= ${GNUSTEP_PREFIX}/System/Library/Bundles/libgnustep-back.bundle
SYSLIBDIR= ${GNUSTEP_PREFIX}/System/Library/Libraries
COMBOLIBDIR= ${SYSLIBDIR}
PLIST_SUB+= LOCALLIBRARY=Local/Library
PLIST_SUB+= NOFLAT=""
PLIST_SUB+= GNUSTEP_STABLE="@comment "
.else
BACKBUNDLEDIR= ${GNUSTEP_PREFIX}/System/Library/Bundles/libgnustep-back.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/
SYSLIBDIR= ${GNUSTEP_PREFIX}/System/Libraries/${GNU_ARCH}/${OPSYS:L}
PLIST_SUB+= LOCALLIBRARY=Local
.endif
COMBOLIBDIR= ${SYSLIBDIR}/gnu-gnu-gnu
PLIST_SUB+= LOCALLIBRARY=Local
PLIST_SUB+= NOFLAT="${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/"
PLIST_SUB+= GNUSTEP_STABLE=""
.endif
.include <bsd.port.pre.mk>

View File

@ -63,12 +63,12 @@
%%RUBY_SITELIBDIR%%/rigs/NSWindow.rb
%%RUBY_SITEARCHLIBDIR%%/librigs.so
@dirrm %%RUBY_SITELIBDIR%%/rigs
GNUstep/%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/librigs.so.0.2.1
GNUstep/%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/librigs.so.0
GNUstep/%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/librigs.so
@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu 2> /dev/null || true
@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%% 2> /dev/null || true
@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%% 2> /dev/null || true
GNUstep/%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%librigs.so.0.2.1
GNUstep/%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%librigs.so.0
GNUstep/%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%librigs.so
%%GNUSTEP_STABLE%%@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu 2> /dev/null || true
%%GNUSTEP_STABLE%%@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%% 2> /dev/null || true
%%GNUSTEP_STABLE%%@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%% 2> /dev/null || true
@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%%/Libraries 2> /dev/null || true
@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%%/Headers 2> /dev/null || true
@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%% 2> /dev/null || true