[PATCH app-rstart 12/15] config: add links from x and x11 from @Aliases

[Gaetan Nadon]

This was part of the FIXME code removed earlier.
The information was read from the @Aliases file, but it
has not changed for the past 8 years. If it does change,
the makefile will need to be updated.

The links are broken in 1.0.2 and restored in 1.0.3

Using Automake, these links are now properly removed when uninstalling.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 commands/Makefile.am |    7 +++++++
 configure.ac         |    7 +------
 contexts/Makefile.am |    7 +++++++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/commands/Makefile.am b/commands/Makefile.am
index af4c8a3..9bdd4e5 100644
--- a/commands/Makefile.am
+++ b/commands/Makefile.am
@@ -7,3 +7,10 @@ nobase_dist_commands_DATA =	\
 	x11r6/@List		\
 	@List			\
 	ListGenericCommands
+
+install-data-hook:
+	$(AM_V_GEN)(cd $(DESTDIR)$(commandsdir) && rm -f x && $(LN_S) x11r6 x)
+	$(AM_V_GEN)(cd $(DESTDIR)$(commandsdir) && rm -f x11 && $(LN_S) x11r6 x11)
+
+uninstall-hook:
+	$(AM_V_at)(cd $(DESTDIR)$(commandsdir) && rm -f x x11)
diff --git a/configure.ac b/configure.ac
index 9942106..8de7460 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,13 +35,8 @@ XORG_DEFAULT_OPTIONS
 
 AC_CONFIG_HEADERS([config.h])
 
-AC_ARG_VAR([RM],[Name of the rm command])
-AC_ARG_VAR([LN],[Name of the ln command])
-
-AC_CHECK_PROG([RM],[rm],[rm -f])
-AC_CHECK_PROG([LN],[ln],[ln -s])
-
 AC_CHECK_PROGS(RSH,[remsh rsh rcmd])
+AC_PROG_LN_S
 
 # Define the root directory for client/server/config
 AC_SUBST([rstartdir],[$libdir/X11/rstart])
diff --git a/contexts/Makefile.am b/contexts/Makefile.am
index f96dc15..6e3824a 100644
--- a/contexts/Makefile.am
+++ b/contexts/Makefile.am
@@ -19,3 +19,10 @@ x11r6: x11r6.in
 	$(AM_V_GEN)$(SED) $(PATH_SUBSTS) < $< > $@
 
 CLEANFILES = $(contexts_DATA)
+
+install-data-hook:
+	$(AM_V_GEN)(cd $(DESTDIR)$(contextsdir) && rm -f x && $(LN_S) x11r6 x)
+	$(AM_V_GEN)(cd $(DESTDIR)$(contextsdir) && rm -f x11 && $(LN_S) x11r6 x11)
+
+uninstall-hook:
+	$(AM_V_at)(cd $(DESTDIR)$(contextsdir) && rm -f x x11)
-- 
1.6.0.4