handle SCRIPTS and LIBSCRIPTS similar to PROGRAMS

diff --git a/automake.in b/automake.in
index c2732f5b3ca8c3c6fe34dc06b6ea7f3af73fbb10..91d199e57435b3292c7d3aac17401356baacab1f 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -76,7 +76,7 @@ do
   cat $AM_DIR/header.am >&5
 
   DEFS= INCLUDES= CPPFLAGS= CFLAGS=
-  SOURCES= CONFIG_HEADER= SUBDIRS= PROGRAMS= LIBPROGRAMS=
+  SOURCES= CONFIG_HEADER= SUBDIRS= PROGRAMS= LIBPROGRAMS= SCRIPTS= LIBSCRIPTS=
   LIBRARIES= TEXINFOS= MANS=
 
   eval `sed -n -f $am_rmnl ${am_makefile}.am | sed -n -f $am_ass`
@@ -121,17 +121,19 @@ ${am_file}_OBJECTS = ${am_file}.${kr}o" >&4
     done
   fi
 
-  if test -n "$PROGRAMS$LIBPROGRAMS"; then
-    if test -n "$PROGRAMS"; then
+  if test -n "$PROGRAMS$LIBPROGRAMS$SCRIPTS$LIBSCRIPTS"; then
+    if test -n "$PROGRAMS$SCRIPTS"; then
       cat $AM_DIR/programs.am >&5
     fi
-    if test -n "$LIBPROGRAMS"; then
+    if test -n "$LIBPROGRAMS$LIBSCRIPTS"; then
       cat $AM_DIR/libprograms.am >&5
     fi
-    for am_prog in $PROGRAMS $LIBPROGRAMS; do
-      eval "test \"\$target_$am_prog\" != explicit" &&
-        sed "s/@PROGRAM@/$am_prog/g" $AM_DIR/program.am >&5
-    done
+    if test -n "$PROGRAMS$LIBPROGRAMS"; then
+      for am_prog in $PROGRAMS $LIBPROGRAMS; do
+        eval "test \"\$target_$am_prog\" != explicit" &&
+          sed "s/@PROGRAM@/$am_prog/g" $AM_DIR/program.am >&5
+      done
+    fi
   fi
 
   if test -n "$LIBRARIES"; then

diff --git a/dist-subd-top.am b/dist-subd-top.am
index e9116d4491644f7f6b580cc2d78bb5ffc63c8e1e..2e2c922db3b76735dd4fa941f66b4c04748e9965 100644 (file)
--- a/dist-subd-top.am
+++ b/dist-subd-top.am
@@ -1,9 +1,9 @@
-dist: $(DIST_FILES) distname
+dist: $(DIST_FILES) $(DIST_DIRS) distname
        rm -rf `cat distname`; mkdir `cat distname`
        @for file in $(DIST_FILES); do \
          echo linking $$file; \
-         ln $(srcdir)/$$file `cat distname` || \
-           { echo copying $$file instead; cp -p $(srcdir)/$$file `cat distname`;}; \
+         ln $(srcdir)/$$file `cat distname`/$$file || \
+           { echo copying $$file instead; cp -p $(srcdir)/$$file `cat distname`/$$file;}; \
        done
        for subdir in $(SUBDIRS); do \
          (cd $$subdir; $(MAKE) subdir=$$subdir $@); done

diff --git a/dist-subd.am b/dist-subd.am
index 50bb14d430d867a0fe2e413f2c786fe1fb90012b..34c4c2c1e2c1cb3c0a1b9ce797d9fa4da30d3667 100644 (file)
--- a/dist-subd.am
+++ b/dist-subd.am
@@ -1,8 +1,8 @@
-dist: $(DIST_FILES)
-       mkdir ../`cat ../distname`/$(subdir)
+dist: $(DIST_FILES) $(DIST_DIRS)
+       -mkdir ../`cat ../distname`/$(subdir)
        @for file in $(DIST_FILES); do \
          echo linking $$file; \
-         ln $(srcdir)/$$file ../`cat ../distname`/$(subdir) || \
-           { echo copying $$file instead; cp -p $(srcdir)/$$file ../`cat ../distname`/$(subdir);}; \
+         ln $(srcdir)/$$file ../`cat ../distname`/$(subdir)/$$file || \
+           { echo copying $$file instead; cp -p $(srcdir)/$$file ../`cat ../distname`/$(subdir)/$$file;}; \
        done
 

diff --git a/dist.am b/dist.am
index e497379fb00817143eeaef0e66755b13a4d2b27c..24721b8cf4d821a52d3ac2fc213b66072780e508 100644 (file)
--- a/dist.am
+++ b/dist.am
@@ -1,9 +1,9 @@
-dist: $(DIST_FILES) distname
+dist: $(DIST_FILES) $(DIST_DIRS) distname
        rm -rf `cat distname`; mkdir `cat distname`
        @for file in $(DIST_FILES); do \
          echo linking $$file; \
-         ln $(srcdir)/$$file `cat distname` || \
-           { echo copying $$file instead; cp -p $(srcdir)/$$file `cat distname`;}; \
+         ln $(srcdir)/$$file `cat distname`/$$file || \
+           { echo copying $$file instead; cp -p $(srcdir)/$$file `cat distname`/$$file;}; \
        done
        chmod -R a+r `cat distname`
        tar -chozf `cat distname`.tar.gz `cat distname`

diff --git a/header-vars.am b/header-vars.am
index 29114122c4b9a6c7d52e0bbdf41e2d4a836da689..171dac52da2d75a9926d8659357ee9e6602ee170 100644 (file)
--- a/header-vars.am
+++ b/header-vars.am
@@ -41,4 +41,4 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 transform = @program_transform_name@
 
-ALL = ${PROGRAMS} ${LIBPROGRAMS} ${LIBFILES}
+ALL = ${PROGRAMS} ${LIBPROGRAMS} ${SCRIPTS} ${LIBSCRIPTS} ${LIBFILES}

diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index 29114122c4b9a6c7d52e0bbdf41e2d4a836da689..171dac52da2d75a9926d8659357ee9e6602ee170 100644 (file)
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -41,4 +41,4 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 transform = @program_transform_name@
 
-ALL = ${PROGRAMS} ${LIBPROGRAMS} ${LIBFILES}
+ALL = ${PROGRAMS} ${LIBPROGRAMS} ${SCRIPTS} ${LIBSCRIPTS} ${LIBFILES}

diff --git a/libprograms.am b/libprograms.am
index 8da8a7114eff9377749814e1bf3b93acc088ea66..77d42c3b42f9ead5cc288884ad85bb6f2d8c14fd 100644 (file)
--- a/libprograms.am
+++ b/libprograms.am
@@ -1,15 +1,15 @@
 install:: install-libprograms
 
-install-libprograms: $(LIBPROGRAMS)
+install-libprograms: $(LIBPROGRAMS) $(LIBSCRIPTS)
        $(top_srcdir)/mkinstalldirs $(libexecdir)
-       for p in $(LIBPROGRAMS); do \
+       for p in $(LIBPROGRAMS) $(LIBSCRIPTS); do \
          $(INSTALL_PROGRAM) $$p $(libexecdir)/`echo $$p|sed '$(transform)'`; \
        done
 
 uninstall:: uninstall-libprograms
 
 uninstall-libprograms:
-       for p in $(LIBPROGRAMS); do \
+       for p in $(LIBPROGRAMS) $(LIBSCRIPTS); do \
          rm -f $(libexecdir)/`echo $$p|sed '$(transform)'`; \
        done
 

diff --git a/programs.am b/programs.am
index fe527806be25b09d89c8f223f472d6e1bafcab94..e97024fe00bb78fa3bc6dafa033406acd8189642 100644 (file)
--- a/programs.am
+++ b/programs.am
@@ -1,15 +1,15 @@
 install:: install-programs
 
-install-programs: $(PROGRAMS)
+install-programs: $(PROGRAMS) $(SCRIPTS)
        $(top_srcdir)/mkinstalldirs $(bindir)
-       for p in $(PROGRAMS); do \
+       for p in $(PROGRAMS) $(SCRIPTS); do \
          $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
        done
 
 uninstall:: uninstall-programs
 
 uninstall-programs:
-       for p in $(PROGRAMS); do \
+       for p in $(PROGRAMS) $(SCRIPTS); do \
          rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
        done