From 39ac94bc8433b950a3ec2455fa0ffdfd9d06c6ca Mon Sep 17 00:00:00 2001 From: Dirk Meyer Date: Sat, 26 Jul 2003 14:53:55 +0000 Subject: [PATCH] - flat layout Approved by: knu --- devel/ruby-gnustep/Makefile | 14 ++++++++++---- devel/ruby-gnustep/pkg-plist | 12 ++++++------ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/devel/ruby-gnustep/Makefile b/devel/ruby-gnustep/Makefile index 0f08166c741b..09b5f3c2ba71 100644 --- a/devel/ruby-gnustep/Makefile +++ b/devel/ruby-gnustep/Makefile @@ -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 diff --git a/devel/ruby-gnustep/pkg-plist b/devel/ruby-gnustep/pkg-plist index e6f705afee82..60ea2d033212 100644 --- a/devel/ruby-gnustep/pkg-plist +++ b/devel/ruby-gnustep/pkg-plist @@ -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