diff options
| author | Petr Mladek <pmladek@walk.suse.cz> | 2010-09-14 14:36:51 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@walk.suse.cz> | 2010-09-14 15:56:44 +0200 |
| commit | 8657b3e54ba1d2b06ca88c3762c51847cfaca070 (patch) | |
| tree | 828bdbbbc3f6b980d2db5c554ad344390519cd92 /Makefile.shared | |
| parent | 1be6c28171c72f67a29e2972298b2f7a5f191da8 (diff) | |
remove obsolete --with-tag configure option
* ooo-build and piece sources has the same version now; it is possible to
use --with-source-version to use another piece sources
* renamed CVSTAG variable to the more descriptive OOO_SOURCEDIRNAME
* removed some not longer used functionality (related to CVSTAG and
OOo sources)
Diffstat (limited to 'Makefile.shared')
| -rw-r--r-- | Makefile.shared | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.shared b/Makefile.shared index c5f74dde9..9c8229a19 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -54,8 +54,8 @@ $(STAMP_DIR)/patch.apply : $(top_srcdir)/patches/apply.pl \ $(TOOLSDIR)/bin/transform --revert $(TOOLSDIR) $(OOBUILDDIR) test -n "$(OOO_GIT_MANAGED)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) prepare || true FLAGS=`$(TOOLSDIR)/bin/applyflags $(TOOLSDIR)/bin` ; \ - CURRTAG=$(CVSTAG); test -f $(OOBUILDDIR)/.tag && CURRTAG=`cat $(OOBUILDDIR)/.tag`; \ - chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS --tag=$$CURRTAG ; + CURSOURCE=$(OOO_SOURCEDIRNAME); test -f $(OOBUILDDIR)/.source && CURSOURCE=`cat $(OOBUILDDIR)/.source`; \ + chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS --tag=$$CURSOURCE ; test -n "$(OOO_GIT_MANAGED)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) postpare || true $(TOOLSDIR)/bin/transform --apply $(TOOLSDIR) $(OOBUILDDIR) test -n "$(OOO_GIT_MANAGED)" && cd $(OOBUILDDIR) && git commit -am 'Font munging.' || true @@ -71,8 +71,8 @@ patch.unapply: patch.list: @FLAGS=`$(TOOLSDIR)/bin/applyflags $(TOOLSDIR)/bin` ; \ - CURRTAG=$(CVSTAG); test -f $(OOBUILDDIR)/.tag && CURRTAG=`cat $(OOBUILDDIR)/.tag`; \ - chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS --dry-run --quiet --tag=$$CURRTAG + CURSOURCE=$(OOO_SOURCEDIRNAME); test -f $(OOBUILDDIR)/.source && CURSOURCE=`cat $(OOBUILDDIR)/.source`; \ + chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS --dry-run --quiet --tag=$$CURSOURCE refresh: $(STAMP_DIR)/refresh $(STAMP_DIR)/refresh : $(CLONEDIR)/repos_changed |