X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ircd%2FMakefile.in;h=d803749d93be03d1799b63d6111fd7b15cb4de06;hb=03c46045d7842ef91735201a7ec14f229bc47c12;hp=abc2f5b3217db7f8405392b10f22bb1680e8ce4c;hpb=037ea5b9ceaec42f9000cd6d3c47e548fd472d31;p=ircu2.10.12-pk.git

diff --git a/ircd/Makefile.in b/ircd/Makefile.in
index abc2f5b..d803749 100644
--- a/ircd/Makefile.in
+++ b/ircd/Makefile.in
@@ -55,7 +55,7 @@ RPATH = ${DPATH}/remote.motd
 
 CC = @CC@
 CFLAGS = @CFLAGS@
-CPPFLAGS = -I.. -I${top_srcdir}/include @CPPFLAGS@
+CPPFLAGS = -I. -I.. -I${top_srcdir}/include @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 
@@ -227,7 +227,7 @@ ircd: ${OBJS} ../include/patchlevel.h version.o
 # only that one sum?
 #
 version.c: version.c.SH s_serv.c s_user.c channel.c s_bsd.c s_misc.c ircd.c
-	${SHELL} version.c.SH
+	${SHELL} ${srcdir}/version.c.SH
 
 ircd_string.o: ircd_string.c chattr.tab.c
 
@@ -238,15 +238,19 @@ chattr.tab.c: table_gen
 	./table_gen > chattr.tab.c
 
 chkcrule.o: crule.c
-	${CC} ${CFLAGS} ${CPPFLAGS} -DCR_CHKCONF -o chkcrule.o -c crule.c
+	${CC} ${CFLAGS} ${CPPFLAGS} -DCR_CHKCONF -o chkcrule.o -c \
+		${srcdir}/crule.c
 
 chkconf: chkconf.o fda.o match.o chkcrule.o ircd_alloc.o fileio.o ircd_string.o
 	${CC} chkconf.o fda.o match.o chkcrule.o ircd_alloc.o fileio.o \
 	ircd_string.o ${LDFLAGS} ${LIBS} -o chkconf
 
+mkbindir:
+	@test -d ${BINDIR} || mkdir ${BINDIR}
+
 install: ${INSTALL_RULE}
 
-install-with-symlink: build
+install-with-symlink: build mkbindir
 	@if [ ! -d ${DPATH} -a ! -f ${DPATH} ]; then \
 	  echo "Creating directory ${DPATH}"; \
 	  ${MKDIR} ${DPATH}; \
@@ -262,14 +266,14 @@ install-with-symlink: build
 	  ${LN_S} ircd.`cat /tmp/ircd.tag` ${SYMLINK}; )
 	@${RM} /tmp/ircd.tag
 	${INSTALL} -s -m 700 -o ${IRCDOWN} -g ${IRCDGRP} chkconf ${BINDIR}
-	${INSTALL} -m 600 -o ${IRCDOWN} -g ${IRCDGRP} ../doc/example.conf ${DPATH}
+	${INSTALL} -m 600 -o ${IRCDOWN} -g ${IRCDGRP} ${top_srcdir}/doc/example.conf ${DPATH}
 # 	( cd ${DPATH}; \
 # 	  ${TOUCH} ${MPATH}; \
 # 	  ${TOUCH} ${RPATH}; \
 # 	  ${CHOWN} ${IRCDOWN} ${MPATH} ${RPATH}; \
 # 	  ${CHGRP} ${IRCDGRP} ${MPATH} ${RPATH}; )
 
-install-no-symlink: build
+install-no-symlink: build mkbindir
 	@if [ ! -d ${DPATH} -a ! -f ${DPATH} ]; then \
 	  echo "Creating directory ${DPATH}"; \
 	  ${MKDIR} ${DPATH}; \
@@ -280,7 +284,7 @@ install-no-symlink: build
 	@echo "Installing new ircd as ${BINDIR}/ircd :"
 	${INSTALL} -m ${IRCDMODE} -o ${IRCDOWN} -g ${IRCDGRP} ircd ${BINDIR}/ircd
 	${INSTALL} -s -m 700 -o ${IRCDOWN} -g ${IRCDGRP} chkconf ${BINDIR}
-	${INSTALL} -m 600 -o ${IRCDOWN} -g ${IRCDGRP} ../doc/example.conf ${DPATH}
+	${INSTALL} -m 600 -o ${IRCDOWN} -g ${IRCDGRP} ${top_srcdir}/doc/example.conf ${DPATH}
 # 	( cd ${DPATH}; \
 # 	  ${TOUCH} ${MPATH}; \
 # 	  ${TOUCH} ${RPATH}; \
@@ -305,7 +309,8 @@ maintainer-clean: distclean
 # If I read this right, this will only work with gcc.  Still, how many admins
 # are going to be doing "make depend"?
 depend:
-	@if [ -f Makefile.in.bak ]; then \
+	@cd ${srcdir}; \
+	if [ -f Makefile.in.bak ]; then \
 	  echo "make depend: First remove ircd/Makefile.in.bak"; \
 	else \
 	  ( ${MV} Makefile.in Makefile.in.bak; \
@@ -381,11 +386,13 @@ gline.o: gline.c ../config.h ../include/gline.h ../include/client.h \
  ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
  ../include/ircd_events.h ../include/ircd_handler.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_alloc.h ../include/fda.h \
- ../include/ircd_log.h ../include/ircd_reply.h \
- ../include/ircd_string.h ../include/ircd_chattr.h ../include/match.h \
- ../include/numeric.h ../include/s_bsd.h ../include/s_debug.h \
- ../include/s_misc.h ../include/send.h ../include/support.h \
- ../include/msg.h ../include/numnicks.h ../include/sys.h
+ ../include/ircd_features.h ../include/ircd_log.h \
+ ../include/ircd_policy.h ../include/ircd_reply.h \
+ ../include/ircd_snprintf.h ../include/ircd_string.h \
+ ../include/ircd_chattr.h ../include/match.h ../include/numeric.h \
+ ../include/s_bsd.h ../include/s_debug.h ../include/s_misc.h \
+ ../include/send.h ../include/support.h ../include/msg.h \
+ ../include/numnicks.h ../include/sys.h ../include/whocmds.h
 hash.o: hash.c ../config.h ../include/hash.h ../include/client.h \
  ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
  ../include/ircd_events.h ../include/ircd_handler.h \
@@ -463,11 +470,12 @@ jupe.o: jupe.c ../config.h ../include/jupe.h ../include/client.h \
  ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
  ../include/ircd_events.h ../include/ircd_handler.h ../include/hash.h \
  ../include/ircd.h ../include/struct.h ../include/ircd_alloc.h \
- ../include/fda.h ../include/ircd_log.h ../include/ircd_reply.h \
- ../include/ircd_string.h ../include/ircd_chattr.h ../include/match.h \
- ../include/msg.h ../include/numeric.h ../include/numnicks.h \
- ../include/s_bsd.h ../include/s_misc.h ../include/send.h \
- ../include/support.h ../include/sys.h
+ ../include/fda.h ../include/ircd_log.h ../include/ircd_policy.h \
+ ../include/ircd_reply.h ../include/ircd_string.h \
+ ../include/ircd_chattr.h ../include/match.h ../include/msg.h \
+ ../include/numeric.h ../include/numnicks.h ../include/s_bsd.h \
+ ../include/s_misc.h ../include/send.h ../include/support.h \
+ ../include/sys.h
 list.o: list.c ../config.h ../include/list.h ../include/client.h \
  ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
  ../include/ircd_events.h ../include/ircd_handler.h ../include/ircd.h \
@@ -1155,19 +1163,18 @@ s_user.o: s_user.c ../config.h ../include/s_user.h \
  ../include/IPcheck.h ../include/channel.h ../include/ircd_defs.h \
  ../include/class.h ../include/client.h ../include/dbuf.h \
  ../include/msgq.h ../include/ircd_events.h ../include/ircd_handler.h \
- ../include/gline.h ../include/hash.h ../include/ircd.h \
- ../include/struct.h ../include/ircd_alloc.h ../include/fda.h \
- ../include/ircd_chattr.h ../include/ircd_features.h \
- ../include/ircd_log.h ../include/ircd_policy.h \
- ../include/ircd_reply.h ../include/ircd_string.h ../include/list.h \
- ../include/match.h ../include/motd.h ../include/msg.h \
- ../include/numeric.h ../include/numnicks.h ../include/parse.h \
- ../include/querycmds.h ../include/random.h ../include/s_bsd.h \
- ../include/s_conf.h ../include/s_debug.h ../include/s_misc.h \
- ../include/s_serv.h ../include/send.h ../include/sprintf_irc.h \
- ../include/support.h ../include/supported.h ../include/sys.h \
- ../include/userload.h ../include/version.h ../include/whowas.h \
- ../include/handlers.h
+ ../include/hash.h ../include/ircd.h ../include/struct.h \
+ ../include/ircd_alloc.h ../include/fda.h ../include/ircd_chattr.h \
+ ../include/ircd_features.h ../include/ircd_log.h \
+ ../include/ircd_policy.h ../include/ircd_reply.h \
+ ../include/ircd_string.h ../include/list.h ../include/match.h \
+ ../include/motd.h ../include/msg.h ../include/numeric.h \
+ ../include/numnicks.h ../include/parse.h ../include/querycmds.h \
+ ../include/random.h ../include/s_bsd.h ../include/s_conf.h \
+ ../include/s_debug.h ../include/s_misc.h ../include/s_serv.h \
+ ../include/send.h ../include/sprintf_irc.h ../include/support.h \
+ ../include/supported.h ../include/sys.h ../include/userload.h \
+ ../include/version.h ../include/whowas.h ../include/handlers.h
 send.o: send.c ../config.h ../include/send.h ../include/channel.h \
  ../include/ircd_defs.h ../include/class.h ../include/client.h \
  ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \
@@ -1205,7 +1212,8 @@ whocmds.o: whocmds.c ../config.h ../include/whocmds.h \
  ../include/channel.h ../include/ircd_defs.h ../include/client.h \
  ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \
  ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
- ../include/struct.h ../include/ircd_chattr.h ../include/ircd_reply.h \
+ ../include/struct.h ../include/ircd_chattr.h ../include/ircd_policy.h \
+ ../include/ircd_reply.h ../include/ircd_snprintf.h \
  ../include/ircd_string.h ../include/list.h ../include/match.h \
  ../include/numeric.h ../include/numnicks.h ../include/querycmds.h \
  ../include/ircd_features.h ../include/random.h ../include/s_bsd.h \