ossp-pkg/iselect/Makefile.in 1.2 -> 1.3
--- Makefile.in 2000/07/25 11:53:24 1.2
+++ Makefile.in 2004/09/11 15:18:49 1.3
@@ -16,10 +16,6 @@
# installation tools
SHTOOL = @SHTOOL@
-NEWVERS = $(SHTOOL) version
-INSTALL = $(SHTOOL) install
-MKDIR = $(SHTOOL) mkdir
-FIXPERM = $(SHTOOL) fixperm
# installation paths
prefix = @prefix@
@@ -39,12 +35,12 @@
config: configure config_ac.h.in
-configure: configure.in aclocal.m4 acconfig.h
+configure: configure.in aclocal.m4
rm -f configure
autoconf configure.in >configure
chmod 770 configure
-config_ac.h.in: configure.in acconfig.h
+config_ac.h.in: configure.in
rm -f config_ac.h.in
autoheader configure.in >config_ac.h.in
@@ -52,64 +48,40 @@
# THE RELEASE STUFF
# ------------------------------------------------
-_GETDISTINFO = \
- _version=`$(NEWVERS) -lc -dshort iselect_version.c`; \
- _date=`date '+%y%m%d_%H%M'`
-
-_BUILDDIST = \
- echo "Creating tarball..."; \
- tar cvf - * |\
- tardy --user_number=1000 --user_name=rse \
- --group_number=1000 --group_name=en \
- --prefix=$${_distname} - |\
- gzip >$${_tarball}; \
- echo "Done"; \
- ls -l $${_tarball}
-
-_NEWVERS = \
- $(NEWVERS) -lc -piSelect $$OPT iselect_version.c; \
- V=`$(NEWVERS) -lc -dlong iselect_version.c`;\
- sed -e "s/Version .*(.*)/Version $$V/g" <README >README.n && mv README.n README; \
- sed -e "s/Version .*(.*)/Version $$V/g" <iselect_readme.txt >iselect_readme.txt.n && mv iselect_readme.txt.n iselect_readme.txt;
+_VERSION_FILE = \
+ iselect_version.c
-_UPDATEVERS = \
- V=`$(NEWVERS) -lc -dshort iselect_version.c`;\
- $(NEWVERS) -lc -piSelect -s $$V iselect_version.c; \
- V=`$(NEWVERS) -lc -dlong iselect_version.c`;\
+_VERSION = \
+ echo "updating package version"; \
+ $(SHTOOL) version -lc -n 'iSelect' -p iselect_ $$OPT $(_VERSION_FILE); \
+ V=`$(SHTOOL) version -lc -dlong $(_VERSION_FILE)`; \
sed -e "s/Version .*(.*)/Version $$V/g" <README >README.n && mv README.n README; \
- sed -e "s/Version .*(.*)/Version $$V/g" <iselect_readme.txt >iselect_readme.txt.n && mv iselect_readme.txt.n iselect_readme.txt;
-
-release: distclean fixperm
- @$(_GETDISTINFO) \
- _distname="iselect-$${_version}"; \
- _tarball="/tmp/$${_distname}.tar.gz"; \
- echo "Release Distribution: iSelect Version $$_version"; \
- $(_BUILDDIST); \
- mv /tmp/$${_distname}.tar.gz $${_distname}.tar.gz; \
+ sed -e "s/Version .*(.*)/Version $$V/g" <iselect_readme.txt >iselect_readme.txt.n && mv iselect_readme.txt.n iselect_readme.txt
+_TARBALL = \
+ $(SHTOOL) tarball -o $${NAME}.tar.gz -d $${NAME} -u rse -g en \
+ -e 'CVS,\.cvsignore,\.configure,\.\#.*,\.[ao]$$' -c 'gzip --best' .
+
+dist: distclean fixperm
+ @V=`$(SHTOOL) version -l c -d short $(_VERSION_FILE)`; NAME="iselect-$$V"; \
+ $(ECHO) "Rolling RELEASE tarball $$NAME.tar.gz"; $(_TARBALL)
snap: distclean fixperm
- @$(_GETDISTINFO) \
- _distname="iselect-$${_version}-SNAP-$$_date"; \
- _tarball="/tmp/$${_distname}.tar.gz"; \
- echo "Snap of whole source tree: iSelect Version $$_version as of $$_date"; \
- $(_BUILDDIST); \
- mv /tmp/$${_distname}.tar.gz $${_distname}.tar.gz
+ @V=`$(SHTOOL) version -l c -d short $(_VERSION_FILE)`; NAME="iselect-$$V-SNAP"; \
+ $(ECHO) "Rolling SNAPSHOT tarball $$NAME.tar.gz"; $(_TARBALL)
new-version:
- OPT="-iv"; $(_NEWVERS)
-new-revision:
- OPT="-ir"; $(_NEWVERS)
-new-betalevel:
- OPT="-ib"; $(_NEWVERS)
-new-patchlevel:
- OPT="-iP"; $(_NEWVERS)
-new-release:
- OPT="-s$(R)"; $(_NEWVERS)
+ @V="$(VERSION)"; \
+ if [ ".$$V" != . ]; then \
+ OPT="-s$$V"; \
+ else \
+ OPT="-e"; \
+ fi; \
+ $(_VERSION)
update-version:
- $(_UPDATEVERS)
+ @OPT="-s`$(SHTOOL) version -lc -dshort $(_VERSION_FILE)`" && $(_VERSION)
fixperm:
- $(FIXPERM) *
+ $(SHTOOL) fixperm *
# ------------------------------------------------
# THE PROGRAM
@@ -137,14 +109,14 @@
$(CC) $(CFLAGS) -o iselect_help.o -c iselect_help.c
iselect_help.c: iselect_help.txt iselect_version.c
- V=`$(NEWVERS) -l c -d long iselect_version.c`; \
+ V=`$(SHTOOL) version -l c -d long iselect_version.c`; \
./etc/asc2c iselect_help.txt iselect_help iSelect_Help "$$V"
iselect_readme.o: iselect_readme.c
$(CC) $(CFLAGS) -o iselect_readme.o -c iselect_readme.c
iselect_readme.c: iselect_readme.txt iselect_version.c
- V=`$(NEWVERS) -l c -d long iselect_version.c`; \
+ V=`$(SHTOOL) version -l c -d long iselect_version.c`; \
./etc/asc2c iselect_readme.txt iselect_readme iSelect_README "$$V"
# ------------------------------------------------
@@ -152,7 +124,7 @@
# ------------------------------------------------
iselect.1: iselect.pod iselect_version.c
- V=`$(NEWVERS) -l c -d long iselect_version.c`; \
+ V=`$(SHTOOL) version -l c -d long iselect_version.c`; \
sed -e "s|\@V\@|$$V|g" \
<iselect.pod >/tmp/iselect.pod; \
pod2man --section=1 \
@@ -166,10 +138,10 @@
# ------------------------------------------------
install: all
- $(MKDIR) $(bindir)
- $(MKDIR) $(mandir)/man1
- $(INSTALL) -c -m 755 -s iselect $(bindir)/iselect
- $(INSTALL) -c -m 644 iselect.1 $(mandir)/man1/iselect.1
+ $(SHTOOL) mkdir -f -p -m 755 $(bindir)
+ $(SHTOOL) mkdir -f -p -m 755 $(mandir)/man1
+ $(SHTOOL) install -c -m 755 -s iselect $(bindir)/iselect
+ $(SHTOOL) install -c -m 644 iselect.1 $(mandir)/man1/iselect.1
# ------------------------------------------------
# CLEANUP
|
|
