summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--GNUmakefile2
-rw-r--r--Makefile.am10
-rw-r--r--maint-cfg.mk2
3 files changed, 8 insertions, 6 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 96f00f3432..78ba0d1a38 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -3,7 +3,7 @@ ifneq ($(have-gnulib-files),yes)
gnulib.mk:
ln -s build-aux/GNUmakefile gnulib.mk || cp build-aux/GNUmakefile gnulib.mk
ln -s build-aux/maint.mk maint.mk || cp build-aux/maint.mk maint.mk
- mv build-aux/config.rpath{,-}
+ mv build-aux/config.rpath build-aux/config.rpath-
endif
-include gnulib.mk
diff --git a/Makefile.am b/Makefile.am
index 3acf6d00ca..d886059900 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,9 +54,11 @@ release:
git-push
gpg -b $(distdir).tar.bz2
gpg --verify $(distdir).tar.bz2.sig
- scp $(distdir).tar.bz2{,.sig} igloo.linux.gr:~ftp/pub/gnutls/devel/
+ scp $(distdir).tar.bz2 $(distdir).tar.bz2.sig igloo.linux.gr:~ftp/pub/gnutls/devel/
ssh igloo.linux.gr 'cd ~ftp/pub/gnutls/devel/ && sha1sum *.tar.bz2 > CHECKSUMS'
- cp -v $(distdir).tar.bz2{,.sig} $(htmldir)/releases/
- cp -v doc/reference/html/*.{html,png,css,devhelp} $(htmldir)/reference/
- cd $(htmldir) && cvs add -kb releases/$(distdir).tar.bz2{,.sig} && \
+ cp -v $(distdir).tar.bz2 $(distdir).tar.bz2.sig $(htmldir)/releases/
+ cp -v doc/reference/html/*.html doc/reference/html/*.png doc/reference/html/*.css doc/reference/html/*.devhelp $(htmldir)/reference/
+ cd $(htmldir) && \
+ cvs add -kb releases/$(distdir).tar.bz2 \
+ releases/$(distdir).tar.bz2.sig && \
cvs commit -m "Update." manual/ reference/ releases/
diff --git a/maint-cfg.mk b/maint-cfg.mk
index 4ccabe13db..6bbcf11624 100644
--- a/maint-cfg.mk
+++ b/maint-cfg.mk
@@ -28,7 +28,7 @@ endif
autoreconf:
test -f ./configure || autoreconf --install
- mv build-aux/config.rpath{-,}
+ mv build-aux/config.rpath- build-aux/config.rpath
bootstrap: autoreconf
./configure $(CFGFLAGS)