summaryrefslogtreecommitdiffstats
path: root/scripts/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/Makefile.am')
-rw-r--r--scripts/Makefile.am39
1 files changed, 19 insertions, 20 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index d89fd306..29c81aa5 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -4,7 +4,9 @@ AUTOMAKE_OPTIONS = std-options
SUBDIRS = po
bin_SCRIPTS = \
- $(OURSCRIPTS)
+ $(OURSCRIPTS) \
+ repo-remove \
+ repo-elephant
OURSCRIPTS = \
makepkg \
@@ -12,7 +14,6 @@ OURSCRIPTS = \
pacman-key \
pacman-optimize \
pkgdelta \
- rankmirrors \
repo-add
EXTRA_DIST = \
@@ -21,13 +22,14 @@ EXTRA_DIST = \
pacman-key.sh.in \
pacman-optimize.sh.in \
pkgdelta.sh.in \
- rankmirrors.sh.in \
repo-add.sh.in \
$(LIBRARY)
LIBRARY = \
library/output_format.sh \
- library/parse_options.sh
+ library/parseopts.sh \
+ library/human_to_size.sh \
+ library/size_to_human.sh
# Files that should be removed, but which Automake does not know.
MOSTLYCLEANFILES = $(bin_SCRIPTS)
@@ -51,6 +53,7 @@ edit = sed \
-e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \
-e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \
-e 's|@BUILDSCRIPT[@]|$(BUILDSCRIPT)|g' \
+ -e "s|@INODECMD[@]|$(INODECMD)|g" \
-e 's|@SIZECMD[@]|$(SIZECMD)|g' \
-e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \
-e 's|@DUPATH[@]|$(DUPATH)|g' \
@@ -60,18 +63,15 @@ edit = sed \
## All the scripts depend on Makefile so that they are rebuilt when the
## prefix etc. changes. Use chmod -w to prevent people from editing the
## wrong file by accident.
-# two 'test' lines- make sure we can handle both sh and py type scripts
-# third 'test' line- make sure one of the two checks succeeded
$(OURSCRIPTS): Makefile
- @echo ' ' GEN $@;
- @$(RM) $@
- @test -f $(srcdir)/$@.sh.in && m4 -P -I $(srcdir) $(srcdir)/$@.sh.in | $(edit) >$@
- @chmod +x $@
- @chmod a-w $@
+ $(AM_V_at)$(RM) $@
+ $(AM_V_GEN)test -f $(srcdir)/$@.sh.in && m4 -P -I $(srcdir) $(srcdir)/$@.sh.in | $(edit) >$@
+ $(AM_V_at)chmod +x,a-w $@
+ @$(BASH_SHELL) -O extglob -n $@
makepkg: \
$(srcdir)/makepkg.sh.in \
- $(srcdir)/library/parse_options.sh
+ $(srcdir)/library/parseopts.sh
pacman-db-upgrade: \
$(srcdir)/pacman-db-upgrade.sh.in \
@@ -80,7 +80,7 @@ pacman-db-upgrade: \
pacman-key: \
$(srcdir)/pacman-key.sh.in \
$(srcdir)/library/output_format.sh \
- $(srcdir)/library/parse_options.sh
+ $(srcdir)/library/parseopts.sh
pacman-optimize: \
$(srcdir)/pacman-optimize.sh.in \
@@ -88,21 +88,20 @@ pacman-optimize: \
pkgdelta: \
$(srcdir)/pkgdelta.sh.in \
- $(srcdir)/library/output_format.sh
-
-rankmirrors: $(srcdir)/rankmirrors.sh.in
+ $(srcdir)/library/output_format.sh \
+ $(srcdir)/library/parseopts.sh
repo-add: \
$(srcdir)/repo-add.sh.in \
$(srcdir)/library/output_format.sh
repo-remove: $(srcdir)/repo-add.sh.in
- $(RM) repo-remove
- $(LN_S) repo-add repo-remove
+ $(AM_V_at)$(RM) repo-remove
+ $(AM_V_at)$(LN_S) repo-add repo-remove
repo-elephant: $(srcdir)/repo-add.sh.in
- $(RM) repo-elephant
- $(LN_S) repo-add repo-elephant
+ $(AM_V_at)$(RM) repo-elephant
+ $(AM_V_at)$(LN_S) repo-add repo-elephant
install-data-hook:
cd $(DESTDIR)$(bindir) && \