Re: CVS Automake installs noinst_SCRIPTS.

[Pavel Roskin]

Hello, Tom!

> I'm guessing this is related to Akim's latest patches.

Akim does a great job, but he needs a Mozilla-style tinderbox
(http://tinderbox.mozilla.org/) to alert him when something goes wrong.

> Please check this in.
> Bonus points if you also update it to check for `checkdir', which also
> shouldn't exist.

Done.

The fix appears to be quite simple. The testsuite passes. Some real
package using noinst_SCRIPTS is now in a good shape (i.e. `make install'
works as it should and even `make distcheck' passes).

The files I modified are now full of question marks, which I don't really
like, but hopefully some day `if ... else ... endif` will be supported in
the *.am files.

ChangeLog:
        * header.am: Use ?INSTALL? in the install and uninstall rules.
        * scripts.am: Likewise.

__________________________
Index: header.am
--- header.am
+++ header.am
@@ -16,29 +16,29 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.

-_am_installdirs += $(DESTDIR)$(%NDIR%dir)
-?EXEC?.PHONY install-exec-am: install-%DIR%HEADERS
-?!EXEC?.PHONY install-data-am: install-%DIR%HEADERS
-install-%DIR%HEADERS: $(%DIR%_HEADERS)
-       @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
+?INSTALL?_am_installdirs += $(DESTDIR)$(%NDIR%dir)
+?INSTALL??EXEC?.PHONY install-exec-am: install-%DIR%HEADERS
+?INSTALL??!EXEC?.PHONY install-data-am: install-%DIR%HEADERS
+?INSTALL?install-%DIR%HEADERS: $(%DIR%_HEADERS)
+?INSTALL?      @$(NORMAL_INSTALL)
+?INSTALL?      $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
-       @list='$(%DIR%_HEADERS)'; for p in $$list; do \
+?INSTALL?      @list='$(%DIR%_HEADERS)'; for p in $$list; do \
 ## A header file can be in the source directory or the build directory.
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-?BASE?   f="`echo $$p | sed -e 's|^.*/||'`"; \
-?!BASE?          f="$$p"; \
-         echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
-         $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \
-       done
+?INSTALL?        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+?INSTALL??BASE?          f="`echo $$p | sed -e 's|^.*/||'`"; \
+?INSTALL??!BASE?         f="$$p"; \
+?INSTALL?        echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
+?INSTALL?        $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \
+?INSTALL?      done

-.PHONY uninstall-am: uninstall-%DIR%HEADERS
-uninstall-%DIR%HEADERS:
-       @$(NORMAL_UNINSTALL)
-       @list='$(%DIR%_HEADERS)'; for p in $$list; do \
-?BASE?   f="`echo $$p | sed -e 's|^.*/||'`"; \
-?!BASE?          f="$$p"; \
-         echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f"; \
-         rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \
-       done
+?INSTALL?.PHONY uninstall-am: uninstall-%DIR%HEADERS
+?INSTALL?uninstall-%DIR%HEADERS:
+?INSTALL?      @$(NORMAL_UNINSTALL)
+?INSTALL?      @list='$(%DIR%_HEADERS)'; for p in $$list; do \
+?INSTALL??BASE?          f="`echo $$p | sed -e 's|^.*/||'`"; \
+?INSTALL??!BASE?         f="$$p"; \
+?INSTALL?        echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f"; \
+?INSTALL?        rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \
+?INSTALL?      done
Index: scripts.am
--- scripts.am
+++ scripts.am
@@ -16,33 +16,33 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.

-_am_installdirs += $(DESTDIR)$(%NDIR%dir)
-?EXEC?.PHONY install-exec-am: install-%DIR%SCRIPTS
-?!EXEC?.PHONY install-data-am: install-%DIR%SCRIPTS
-install-%DIR%SCRIPTS: $(%DIR%_SCRIPTS)
-       @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
+?INSTALL?_am_installdirs += $(DESTDIR)$(%NDIR%dir)
+?INSTALL??EXEC?.PHONY install-exec-am: install-%DIR%SCRIPTS
+?INSTALL??!EXEC?.PHONY install-data-am: install-%DIR%SCRIPTS
+?INSTALL?install-%DIR%SCRIPTS: $(%DIR%_SCRIPTS)
+?INSTALL?      @$(NORMAL_INSTALL)
+?INSTALL?      $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
-       @list='$(%DIR%_SCRIPTS)'; for p in $$list; do \
-         f="`echo $$p|sed '$(transform)'`"; \
-         if test -f $$p; then \
-           echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
-           $(INSTALL_SCRIPT) $$p $(DESTDIR)$(%NDIR%dir)/$$f; \
-         elif test -f $(srcdir)/$$p; then \
-           echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(%NDIR%dir)/$$f"; 
\
-           $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(%NDIR%dir)/$$f; \
-         else :; fi; \
-       done
+?INSTALL?      @list='$(%DIR%_SCRIPTS)'; for p in $$list; do \
+?INSTALL?        f="`echo $$p|sed '$(transform)'`"; \
+?INSTALL?        if test -f $$p; then \
+?INSTALL?          echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
+?INSTALL?          $(INSTALL_SCRIPT) $$p $(DESTDIR)$(%NDIR%dir)/$$f; \
+?INSTALL?        elif test -f $(srcdir)/$$p; then \
+?INSTALL?          echo " $(INSTALL_SCRIPT) $(srcdir)/$$p 
$(DESTDIR)$(%NDIR%dir)/$$f"; \
+?INSTALL?          $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(%NDIR%dir)/$$f; 
\
+?INSTALL?        else :; fi; \
+?INSTALL?      done

 .PHONY uninstall-am: uninstall-%DIR%SCRIPTS
-uninstall-%DIR%SCRIPTS:
-       @$(NORMAL_UNINSTALL)
-       @list='$(%DIR%_SCRIPTS)'; for p in $$list; do \
-         f="`echo $$p|sed '$(transform)'`"; \
-         echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f"; \
-         rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \
-       done
+?INSTALL?uninstall-%DIR%SCRIPTS:
+?INSTALL?      @$(NORMAL_UNINSTALL)
+?INSTALL?      @list='$(%DIR%_SCRIPTS)'; for p in $$list; do \
+?INSTALL?        f="`echo $$p|sed '$(transform)'`"; \
+?INSTALL?        echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f"; \
+?INSTALL?        rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \
+?INSTALL?      done

 ## Uncomment line in handle_scripts when this is uncommented.
 ## check-%DIR%SCRIPTS:
__________________________

Regards,
Pavel Roskin