diff options
| author | Fridrich Strba <fridrich.strba@bluewin.ch> | 2007-06-19 14:04:53 +0000 |
|---|---|---|
| committer | Fridrich Strba <fridrich.strba@bluewin.ch> | 2007-06-19 14:04:53 +0000 |
| commit | 07b0ce8aac049d0a078787b02be93abc86843ffb (patch) | |
| tree | 7d880a9d90d6d0b1be848baa9dac622d535242f3 /Makefile.shared | |
| parent | c8ded4f8b86ecb49143f0b568a46ec788a58ba1f (diff) | |
Generate patches/apply.pl, so that we use the right version of patch
Diffstat (limited to 'Makefile.shared')
| -rw-r--r-- | Makefile.shared | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.shared b/Makefile.shared index 34e97e0d6..a6d302a39 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -19,7 +19,7 @@ $(OOBUILDDIR)/unpack : if grep localize.sdf $(OOBUILDDIR)/sw/source/ui/app/localize.sdf > /dev/null 2>&1 ; then \ FLAGS="$$FLAGS --distro=Localize"; \ fi ; \ - $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS -f -R ; \ + chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS -f -R ; \ fi cd $(top_srcdir)/bin ; ./unpack rm -f $(STAMP_DIR)/build $(STAMP_DIR)/patch.apply \ @@ -65,7 +65,7 @@ $(STAMP_DIR)/patch.apply : $(top_srcdir)/patches/apply.pl \ if grep localize.sdf $(OOBUILDDIR)/sw/source/ui/app/localize.sdf > /dev/null 2>&1 ; then \ FLAGS="$$FLAGS --distro=Localize"; \ fi ; \ - $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS --tag=$(CVSTAG) ; + chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS --tag=$(CVSTAG) ; $(TOOLSDIR)/bin/transform --apply $(TOOLSDIR) $(OOBUILDDIR) $(TOOLSDIR)/bin/fix-deps $(OOBUILDDIR) rm -f $(STAMP_DIR)/build @@ -80,7 +80,7 @@ patch.unapply: if grep localize.sdf $(OOBUILDDIR)/sw/source/ui/app/localize.sdf > /dev/null 2>&1 ; then \ FLAGS="$$FLAGS --distro=Localize"; \ fi ; \ - $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS -R ; + chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS -R ; rm -f $(STAMP_DIR)/patch.apply # Build bits: |