X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/9d129b8ab0ad8ce11547b9eb01c6a8d9f08adea2..9e7c93067226337decd23dd4fa0ed40dc123f6f4:/tools/Makefile.in

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 252130e5..6adf531a 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -15,18 +15,21 @@ MV		= @MV@
 RM		= @RM@
 LN              = @LN@
 
-IRCDLIBS	= @LIBS@ 
-INCLUDES	= -I../include 
+PROGRAM_PREFIX   = @PROGRAM_PREFIX@
+
+IRCDLIBS	= -L../libratbox/src/.libs -lratbox @LIBS@ 
+INCLUDES	= -I../include -I../libratbox/include
 CPPFLAGS	= ${INCLUDES} @CPPFLAGS@
 
 prefix		= @prefix@
 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)
 
@@ -35,7 +38,7 @@ build: all
 mkpasswd: mkpasswd.c
 	$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) mkpasswd.c -o mkpasswd $(IRCDLIBS)
 
-viconf: viconf.c
+viconf: viconf.c ../include/setup.h ../include/config.h
 	$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) viconf.c -o viconf $(IRCDLIBS)
 
 convertilines: convertilines.c
@@ -44,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
@@ -62,16 +66,12 @@ depend:
 
 # DO NOT DELETE
 
-viconf.o: ../include/config.h ../include/setup.h
-viconf.o:
-
-
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 exec_suffix	= @exec_suffix@
 bindir		= @bindir@
 libexecdir	= @libexecdir@
-confdir		= @confdir@
+sysconfdir	= @sysconfdir@
 localstatedir	= @localstatedir@
 # Change this later! -- adrian
 moduledir	= @moduledir@
@@ -94,12 +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 $(DESTDIR)$(bindir)/viklines
-	$(LN) $(DESTDIR)$(bindir)/viconf $(DESTDIR)$(bindir)/vimotd
-	$(LN) $(DESTDIR)$(bindir)/viconf $(DESTDIR)$(bindir)/viklines
+	$(RM) -f $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)vimotd
+	$(LN) $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)viconf $(DESTDIR)$(bindir)/$(PROGRAM_PREFIX)vimotd