This replaces the *FIXME* shell code which "generates in place" the commands rather than doing a proper installation using the $INSTALL automake specified program.
Using Automake, we can now "uninstall" the commands. Signed-off-by: Gaetan Nadon <[email protected]> --- Makefile.am | 27 +-------------------------- commands/Makefile.am | 9 +++++++++ configure.ac | 3 ++- 3 files changed, 12 insertions(+), 27 deletions(-) create mode 100644 commands/Makefile.am diff --git a/Makefile.am b/Makefile.am index b07dda8..9943520 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -SUBDIRS = man +SUBDIRS = man commands # rstartd server @@ -70,24 +70,6 @@ CLEANFILES = rstart rstartd config install-data-hook: (cd ${srcdir}; \ - for name in `find ./commands -print | grep -v CVS` ; do \ - if test -f $$name; then \ - sed \ - -e 's,ENVPREFIX,RSTART,g' \ - < $$name > $(DESTDIR)$(rstartdir)/$$name; \ - case `basename $(DESTDIR)$(rstartdir)/$$name` in \ - @*) \ - ;; \ - *) \ - chmod a+x $(DESTDIR)$(rstartdir)/$$name ;; \ - esac; \ - else \ - if [ -d $$name ] ; then \ - mkdir -p $(DESTDIR)$(rstartdir)/$$name ; \ - fi; \ - fi; \ - done; \ - \ for name in `find ./contexts -print | grep -v CVS` ; do \ if test -f $$name; then \ sed \ @@ -120,13 +102,6 @@ distuninstallcheck: EXTRA_DIST += \ server.os2 \ \ - commands/ListContexts \ - commands/x11r6/Terminal \ - commands/x11r6/LoadMonitor \ - commands/x11r6/@List \ - commands/@List \ - commands/ListGenericCommands \ - \ contexts/default \ contexts/@Aliases \ contexts/x11r6 \ diff --git a/commands/Makefile.am b/commands/Makefile.am new file mode 100644 index 0000000..af4c8a3 --- /dev/null +++ b/commands/Makefile.am @@ -0,0 +1,9 @@ + +commandsdir = $(rstartdir)/commands +nobase_dist_commands_DATA = \ + ListContexts \ + x11r6/Terminal \ + x11r6/LoadMonitor \ + x11r6/@List \ + @List \ + ListGenericCommands diff --git a/configure.ac b/configure.ac index 1bdbf89..8119a7e 100644 --- a/configure.ac +++ b/configure.ac @@ -61,5 +61,6 @@ AC_SUBST(DEFAULT_X_MANPATH) AC_CONFIG_FILES([ Makefile - man/Makefile]) + man/Makefile + commands/Makefile]) AC_OUTPUT -- 1.6.0.4 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
