During installation, don't unconditionally create an empty `modules-old' directory.

[solanum.git] / modules / Makefile.in

diff --git a/modules/Makefile.in b/modules/Makefile.in
index c2de26fd2addfaf98958ca8076a27d2c919d1d67..8f5d2a725f789339ce101def8ab608c68a4c9c4f 100644 (file)
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -32,10 +32,11 @@ moduledir       = @moduledir@
 # Change this later! -- adrian
 automoduledir   = @moduledir@/autoload
 
-INCLUDES       = -I../include -I../libcharybdis -I../adns $(SSL_INCLUDES)
+INCLUDES       = -I../include -I../libratbox/include $(SSL_INCLUDES)
 CPPFLAGS       = ${INCLUDES} @CPPFLAGS@
 
 CORE_SRCS = \
+  core/m_ban.c \
   core/m_die.c \
   core/m_error.c \
   core/m_join.c \
@@ -47,7 +48,6 @@ CORE_SRCS = \
   core/m_part.c \
   core/m_quit.c \
   core/m_server.c \
-  core/m_sjoin.c \
   core/m_squit.c
 
 TSRCS =                          \
@@ -56,6 +56,7 @@ TSRCS =                          \
   m_away.c \
   m_cap.c \
   m_capab.c \
+  m_certfp.c \
   m_challenge.c \
   m_chghost.c \
   m_close.c \
@@ -64,7 +65,6 @@ TSRCS =                          \
   m_dline.c \
   m_encap.c \
   m_etrace.c \
-  m_gline.c \
   m_help.c \
   m_info.c \
   m_invite.c \
@@ -85,6 +85,7 @@ TSRCS =                          \
   m_ping.c \
   m_pong.c \
   m_post.c \
+  m_privs.c \
   m_rehash.c \
   m_restart.c \
   m_resv.c \
@@ -151,9 +152,6 @@ libmodules.a: $(S_OBJS) static_modules.o
 
 install-mkdirs:
        @echo "ircd: setting up modular directory structure"
-       -@if test ! -d $(DESTDIR)$(moduledir); then \
-                mkdir $(DESTDIR)$(moduledir); \
-        fi
        -@if test -d $(DESTDIR)$(moduledir)-old; then \
                rm -rf $(DESTDIR)$(moduledir)-old; \
        fi
@@ -194,7 +192,7 @@ install_hpux_shared: install-mkdirs
        ${CC} ${CPPFLAGS} ${CFLAGS} -DMODNAME=`basename $< .c`_mheader -c $< -o $@
 
 .c.so:
-       ${CC} ${PICFLAGS} ${CPPFLAGS} ${CFLAGS} $< -o $@
+       ${CC} ${PICFLAGS} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} $< -o $@
 
 .so.sl:
        $(LD) -b $< -o $@
@@ -204,7 +202,7 @@ depend:
        @$(RM) -f .depend
        ${MKDEP} ${CPPFLAGS} ${ALL_SRCS} > .depend
        @$(SED) -e '${SEDOBJ}' < .depend > .depend.tmp-1
-       @$(SED) -e 's/^m_\(die\|kick\|kill\|message\|mode\|nick\|part\|quit\|server\|sjoin\|squit\)/core\/m_\1/' .depend.tmp-1 > .depend.tmp
+       @$(SED) -e 's#^m_die\.#core/&#' -e 's#^m_error\.#core/&#' -e 's#^m_join\.#core/&#' -e 's#^m_kick\.#core/&#' -e 's#^m_kill\.#core/&#' -e 's#^m_message\.#core/&#' -e 's#^m_mode\.#core/&#' -e 's#^m_nick\.#core/&#' -e 's#^m_part\.#core/&#' -e 's#^m_quit\.#core/&#' -e 's#^m_server\.#core/&#' -e 's#^m_squit\.#core/&#'  .depend.tmp-1 > .depend.tmp
        @$(MV) -f .depend.tmp .depend
        @$(RM) -f .depend.tmp-1