238319: Sun packages changes.
authorchristophe.ravel.bugs%sun.com
Thu, 08 Sep 2005 22:23:52 +0000
changeset 3452 4f6d4be1d84f54f34db42f3c8e1c39a5594ddc39
parent 3451 c879194dd4c8d1d26cbb21577fc993316b4b2b6f
child 3453 1d28b84ca0313c2030e95a36d41d759fa027c7f5
push idunknown
push userunknown
push dateunknown
bugs238319
238319: Sun packages changes. Install 64 bit libraries in lib64 on Linux.
pkg/linux/Makefile.in
--- a/pkg/linux/Makefile.in
+++ b/pkg/linux/Makefile.in
@@ -54,23 +54,26 @@ VERSION     = `grep PR_VERSION $(dist_in
 
 SPECFILE    = $(NAME).spec
 
 include $(MOD_DEPTH)/config/autoconf.mk
 
 # Force i386 for non 64 bit build
 ifneq ($(USE_64),1)
 	RPMTARGET = "--target=i386"
+	RPMLIBDIR = lib
+else
+	RPMLIBDIR = lib64
 endif
 
 publish:
 	$(MAKE) clean
 	mkdir -p SOURCES SRPMS RPMS BUILD
 	(cd $(dist_libdir) && tar cphf - .) \
-	| (mkdir -p opt/sun/private/lib && cd opt/sun/private/lib && tar xvfBp -)
+	| (mkdir -p opt/sun/private/$(RPMLIBDIR) && cd opt/sun/private/$(RPMLIBDIR) && tar xvfBp -)
 	(cd $(dist_includedir) && tar cphf - .) \
 	| (mkdir -p opt/sun/private/include/nspr && cd opt/sun/private/include/nspr && tar xvfBp -)
 	tar czvf SOURCES/$(NAME)-$(VERSION).tar.gz opt
 	echo "%define name $(NAME)" >$(SPECFILE)
 	echo "%define version $(VERSION)" >>$(SPECFILE)
 	echo "%define release $(RELEASE)" >>$(SPECFILE)
 	echo "%define buildroot `pwd`/$(NAME)-root" >>$(SPECFILE)
 	echo "%define _topdir `pwd`" >>$(SPECFILE)