Merge pull request #53 from ShadowNinja/clarify_U+R

[solanum.git] / tools / Makefile.in

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 93ae067d6016be2dbacc83f052855d205e8553b8..6adf531a1802b72ec0fc2585b1c3d4cd9e6c339c 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -15,6 +15,8 @@ MV            = @MV@
 RM             = @RM@
 LN              = @LN@
 
+PROGRAM_PREFIX   = @PROGRAM_PREFIX@
+
 IRCDLIBS       = -L../libratbox/src/.libs -lratbox @LIBS@ 
 INCLUDES       = -I../include -I../libratbox/include
 CPPFLAGS       = ${INCLUDES} @CPPFLAGS@
@@ -24,10 +26,10 @@ exec_prefix = @exec_prefix@
 bindir         = @bindir@
 libdir         = @libdir@
 libexecdir     = @libexecdir@
-confdir                = @confdir@
+sysconfdir     = @sysconfdir@
 localstatedir  = @localstatedir@
 
-PROGS          = viconf mkpasswd convertilines convertklines genssl.sh
+PROGS          = viconf mkpasswd convertilines convertklines genssl
 
 all: $(PROGS)
 
@@ -45,13 +47,14 @@ convertilines: convertilines.c
 convertklines: convertklines.c
        $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) convertklines.c -o convertklines $(IRCDLIBS)
 
-genssl.sh:
+genssl: genssl.in
+       cd .. && ./config.status tools/genssl && ./config.status tools/genssl_chmod
 
 clean:
        $(RM) -f encspeed viconf chkconf mkpasswd *~ core *.exe convertklines convertilines
 
 distclean: clean
-       $(RM) -f Makefile
+       $(RM) -f genssl Makefile
 
 lint:
        lint -aacgprxhH $(CPPFLAGS) -DIRCD_PREFIX=\"@prefix@\" $(convertklines_SOURCES) $(mkpasswd_SOURCES) $(viconf_SOURCES) $(encspeed_SOURCES) >>../lint.out
@@ -68,7 +71,7 @@ exec_prefix   = @exec_prefix@
 exec_suffix    = @exec_suffix@
 bindir         = @bindir@
 libexecdir     = @libexecdir@
-confdir                = @confdir@
+sysconfdir     = @sysconfdir@
 localstatedir  = @localstatedir@
 # Change this later! -- adrian
 moduledir      = @moduledir@
@@ -91,11 +94,11 @@ install-mkdirs:
 install: install-mkdirs build
        @echo "ircd: installing tools ($(PROGS))"
        @for i in $(PROGS); do \
-               if test -f $(DESTDIR)$(bindir)/$$i; then \
-                       $(MV) $(DESTDIR)$(bindir)/$$i $(DESTDIR)$(bindir)/$$i.old; \
+               if test -f $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)$$i; then \
+                       $(MV) $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)$$i $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)$$i.old; \
                fi; \
-               $(INSTALL_BIN) $$i $(DESTDIR)$(bindir); \
+               $(INSTALL_BIN) $$i $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)$$i; \
        done; \
-       $(RM) -f $(DESTDIR)$(bindir)/vimotd
-       $(LN) $(DESTDIR)$(bindir)/viconf $(DESTDIR)$(bindir)/vimotd
+       $(RM) -f $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)vimotd
+       $(LN) $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)viconf $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)vimotd