diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2008-08-13 15:17:06 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2008-08-13 15:17:06 +0000 |
| commit | 789a0f39687b3d33426d1be5582b83cbd673366c (patch) | |
| tree | 9abf8435555a814a66005e672dedc397f2b623a3 /Makefile.shared | |
| parent | 319f723296bdc66aaa5af27d9d1904f5d680b8b9 (diff) | |
Update for more vectors.
* patches/dev300/redirect-extensions.diff: update for more
vectors.
* patches/dev300/piece-automation.diff: fix image bits.
* patches/dev300/piece-setup_native.diff: work around
oddness with $(RPM).
* bin/Makefile.am, Makefile.shared: dist applyflags,
and kill the evil cut/paste.
Diffstat (limited to 'Makefile.shared')
| -rw-r--r-- | Makefile.shared | 69 |
1 files changed, 3 insertions, 66 deletions
diff --git a/Makefile.shared b/Makefile.shared index e3a396e06..c3ea3081f 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -13,28 +13,7 @@ $(OOBUILDDIR)/unpack : $(TOOLSDIR)/bin/transform --revert $(TOOLSDIR) $(OOBUILDDIR) -test -n "$(OOO_GIT)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) prepare if test -d $(OOBUILDDIR)/applied_patches ; then \ - FLAGS="--distro=$(DISTRO)"; \ - if test -d $(OOBUILDDIR)/binfilter ; then \ - FLAGS="$$FLAGS --distro=Binfilter"; \ - fi ; \ - if test -d $(OOBUILDDIR)/zlib; then \ - FLAGS="$$FLAGS --distro=System"; \ - fi ; \ - if test -d $(OOBUILDDIR)/sdk_oo ; then \ - FLAGS="$$FLAGS --distro=Sdk"; \ - fi ; \ - if grep localize.sdf $(OOBUILDDIR)/sw/source/ui/app/localize.sdf > /dev/null 2>&1 ; then \ - FLAGS="$$FLAGS --distro=Localize"; \ - fi ; \ - if test -d $(OOBUILDDIR)/swext ; then \ - FLAGS="$$FLAGS --distro=swext"; \ - fi ; \ - if test -n "$(OOO_ADDITIONAL_SECTIONS)" ; then \ - FLAGS="$$FLAGS --additional-sections=$(OOO_ADDITIONAL_SECTIONS)"; \ - fi ; \ - if test "z$(PIECE)" != "z"; then \ - FLAGS="$$FLAGS --pieces --distro=Piece"; \ - fi ; \ + FLAGS=`$(TOOLSDIR)/bin/applyflags $(TOOLSDIR)/bin` ; \ chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS -f -R ; \ fi cd $(top_srcdir)/bin ; ./unpack @@ -68,28 +47,7 @@ $(STAMP_DIR)/patch.apply : $(top_srcdir)/patches/apply.pl \ $(TOOLSDIR)/bin/transform --revert $(TOOLSDIR) $(OOBUILDDIR) -test -n "$(OOO_GIT)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) prepare - FLAGS="--distro=$(DISTRO)"; \ - if test -d $(OOBUILDDIR)/binfilter ; then \ - FLAGS="$$FLAGS --distro=Binfilter"; \ - fi ; \ - if test -d $(OOBUILDDIR)/zlib; then \ - FLAGS="$$FLAGS --distro=System"; \ - fi ; \ - if test -d $(OOBUILDDIR)/sdk_oo ; then \ - FLAGS="$$FLAGS --distro=Sdk"; \ - fi ; \ - if test '$(OOO_LANGS)' != 'en-US' ; then \ - FLAGS="$$FLAGS --distro=Localize"; \ - fi ; \ - if test -d $(OOBUILDDIR)/swext ; then \ - FLAGS="$$FLAGS --distro=swext"; \ - fi ; \ - if test -n "$(OOO_ADDITIONAL_SECTIONS)" ; then \ - FLAGS="$$FLAGS --additional-sections=$(OOO_ADDITIONAL_SECTIONS)"; \ - fi ; \ - if test "z$(PIECE)" != "z"; then \ - FLAGS="$$FLAGS --pieces --distro=Piece"; \ - fi ; \ + FLAGS=`$(TOOLSDIR)/bin/applyflags $(TOOLSDIR)/bin` ; \ chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS --tag=$(CVSTAG) ; -test -n "$(OOO_GIT)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) postpare $(TOOLSDIR)/bin/transform --apply $(TOOLSDIR) $(OOBUILDDIR) @@ -100,28 +58,7 @@ $(STAMP_DIR)/patch.apply : $(top_srcdir)/patches/apply.pl \ patch.unapply: $(TOOLSDIR)/bin/transform --revert $(TOOLSDIR) $(OOBUILDDIR) - FLAGS="--distro=$(DISTRO)"; \ - if test -d $(OOBUILDDIR)/binfilter ; then \ - FLAGS="$$FLAGS --distro=Binfilter"; \ - fi ; \ - if test -d $(OOBUILDDIR)/zlib ; then \ - FLAGS="$$FLAGS --distro=System"; \ - fi ; \ - if test -d $(OOBUILDDIR)/sdk_oo ; then \ - FLAGS="$$FLAGS --distro=Sdk"; \ - fi ; \ - if grep localize.sdf $(OOBUILDDIR)/sw/source/ui/app/localize.sdf > /dev/null 2>&1 ; then \ - FLAGS="$$FLAGS --distro=Localize"; \ - fi ; \ - if test -d $(OOBUILDDIR)/swext ; then \ - FLAGS="$$FLAGS --distro=swext"; \ - fi ; \ - if test -n "$(OOO_ADDITIONAL_SECTIONS)" ; then \ - FLAGS="$$FLAGS --additional-sections=$(OOO_ADDITIONAL_SECTIONS)"; \ - fi ; \ - if test "z$(PIECE)" != "z"; then \ - FLAGS="$$FLAGS --pieces --distro=Piece"; \ - fi ; \ + FLAGS=`$(TOOLSDIR)/bin/applyflags $(TOOLSDIR)/bin` ; \ chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS -R ; rm -f $(STAMP_DIR)/patch.apply |