diff options
| author | christophe.ravel.bugs%sun.com <devnull@localhost> | 2005-07-22 15:32:39 +0000 |
|---|---|---|
| committer | christophe.ravel.bugs%sun.com <devnull@localhost> | 2005-07-22 15:32:39 +0000 |
| commit | a1d3ae19d32b1f3ce88cbd230fd1d2a62610aa68 (patch) | |
| tree | 302b9bb5c4dc164b6f9f3a8f0144c40ae37ed2f3 | |
| parent | fa02e01a60376e51469f0c6f7507cc941323dc1e (diff) | |
| download | nspr-hg-a1d3ae19d32b1f3ce88cbd230fd1d2a62610aa68.tar.gz | |
238319: Sun packages changes
Change rpm packaging for RHEL3 i386 and x86_64.
| -rw-r--r-- | pkg/linux/Makefile.in | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkg/linux/Makefile.in b/pkg/linux/Makefile.in index 84ef0377..38a5eb23 100644 --- a/pkg/linux/Makefile.in +++ b/pkg/linux/Makefile.in @@ -56,12 +56,17 @@ SPECFILE = $(NAME).spec include $(MOD_DEPTH)/config/autoconf.mk +# Force i386 for non 64 bit build +ifneq ($(USE_64),1) + RPMTARGET = "--target=i386" +endif + publish: $(MAKE) clean mkdir -p SOURCES SRPMS RPMS BUILD - (cd $(MOD_DEPTH)/../../dist/$(RELEASE_OBJDIR_NAME)/lib && tar cphf - .) \ + (cd $(dist_libdir) && tar cphf - .) \ | (mkdir -p opt/sun/private/lib && cd opt/sun/private/lib && tar xvfBp -) - (cd $(MOD_DEPTH)/../../dist/$(RELEASE_OBJDIR_NAME)/include && tar cphf - .) \ + (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) @@ -69,8 +74,9 @@ publish: echo "%define release $(RELEASE)" >>$(SPECFILE) echo "%define buildroot `pwd`/$(NAME)-root" >>$(SPECFILE) echo "%define _topdir `pwd`" >>$(SPECFILE) + echo "%define _unpackaged_files_terminate_build 0" >>$(SPECFILE) cat $(srcdir)/$(NAME).spec >>$(SPECFILE) - rpm -ba $(SPECFILE) + rpmbuild $(RPMTARGET) -bb $(SPECFILE) clean: rm -rf $(TOPDIR)/BUILD/$(NAME) |