branch: externals/idlwave
commit acdc76b2a5b6b7682be2abef99de5dfcfd7ce8b9
Author: jdsmith <jdsmith>
Commit: jdsmith <jdsmith>
- Use the VERSION directly from the xemacs package Makefile, since it
must stay in sync with the main package distribution.
---
Makefile | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index d250007d99..b99a49f0a2 100644
--- a/Makefile
+++ b/Makefile
@@ -128,6 +128,10 @@ ifdef HELPFILEMAYBE
HELPFILECODE := $(shell echo $(HELPFILEMAYBE) | grep -q "\.gz$$" && echo "z"
|| echo "j")
endif
+# XEMACS VERSION
+XEMACS-TAG := $(shell perl -ne 'if(/^VERSION\s+=\s+([0-9]\.[0-9]+)/) {print
$$1; exit}' $(XEMACSDIR)/Makefile)
+
+
.PHONY: helpdist
helpdist: helpdistfile
ifdef IDL
@@ -189,15 +193,15 @@ alphadist:
xemacsdistfile: $(XEMACSDISTFILES)
@if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi
cp -pf $(XEMACSDISTFILES) $(XEMACSDIR)/
- perl -pi -e
's/^((?:AUTHOR_)?VERSION\s*=\s*)([0-9]\.[0-9.a-z]+)/$${1}$(TAG)/'
$(XEMACSDIR)/Makefile
- perl -pi -e 's/\bVERSIONTAG\b/$(TAG)/' $(XEMACSDIR)/*
+ (cd $(XEMACSDIR); perl -pi -e 's/\bVERSIONTAG\b/$(TAG)/'
$(XEMACSDISTFILES))
+ perl -pi -e
's/^(AUTHOR_VERSION\s*=\s*)([0-9]\.[0-9.a-z]+)/$${1}$(TAG)/'
$(XEMACSDIR)/Makefile
(cd $(XEMACSDIR); make bindist)
.PHONY: xemacsdist
xemacsdist:
make xemacsdistfile TAG=$(TAG)
- cp -p xemacs-packages/idlwave-$(TAG)-pkg.tar.gz $(DLDIR)
- (cd $(DLDIR); ln -sf idlwave-$(TAG)-pkg.tar.gz idlwave-xemacs.tar.gz)
+ cp -p xemacs-packages/idlwave-$(XEMACS-TAG)-pkg.tar.gz $(DLDIR)
+ (cd $(DLDIR); ln -sf idlwave-$(XEMACS-TAG)-pkg.tar.gz
idlwave-xemacs.tar.gz)
.PHONY: xemacsalphadist
xemacsalphadist:
