Clean up redundant portions of Makefile install rules.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1307 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index 1eee3969d321d6c3500002867c32b4c82db91d12..adf1f9dc8d57c69ec1360a6ee63218f27cca95bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-02-02  Michael Poole <mdpoole@troilus.org>
+
+       * Makefile.in (install): Do not create ${prefix}/include since it
+       is no longer used.
+
+       * ircd/Makefile.in (install-*): Remove commented-out code to touch
+       and chown MPATH and RPATH.
+
 2005-01-26  Michael Poole <mdpoole@troilus.org>
 
        * include/ircd_alloc.h (DoMallocZero): Parenthesize macro
@@ -7,7 +15,7 @@
        * include/memdebug.h (fda_get_byte_count, fda_get_block_count):
        Declare functions used outside memdebug.c.
 
-       * ircd/Makefile.c (UMKPASSWD_SRC): Add memdebug.c.
+       * ircd/Makefile.in (UMKPASSWD_SRC): Add memdebug.c.
 
        * ircd/ircd_alloc.c (DoMalloc, DoMallocZero, DoRealloc): Do not
        use these if using the memdebug version.

diff --git a/Makefile.in b/Makefile.in
index 4ef9d66f5d3d67b193ec533de03213b24d6b9692..211db7678bf30bb23ec578b0529e451eef310d86 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -102,7 +102,6 @@ depend: ${IRCD_MAKEFILES}
 
 install: ${IRCD_MAKEFILES}
        test -d ${prefix} || mkdir ${prefix}
-       test -d ${prefix}/include || mkdir ${prefix}/include
        @for i in ${SUBDIRS}; do \
                echo "Installing $$i..."; \
                cd $$i; ${MAKE} install; cd ..; \

diff --git a/ircd/Makefile.in b/ircd/Makefile.in
index 8914e4b319f919e3df3174f787b46d8eedb2a07b..87972660fcf78d777fe2caa828a7f60310653d40 100644 (file)
--- a/ircd/Makefile.in
+++ b/ircd/Makefile.in
@@ -290,11 +290,6 @@ install-with-symlink: build mkbindir
        @${RM} /tmp/ircd.tag
        ${INSTALL} -s -m 700 -o ${IRCDOWN} -g ${IRCDGRP} umkpasswd ${BINDIR}
        ${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 mkbindir
        @if [ ! -d ${DPATH} -a ! -f ${DPATH} ]; then \
@@ -307,11 +302,6 @@ install-no-symlink: build mkbindir
        @echo "Installing new ircd as ${BINDIR}/ircd :"
        ${INSTALL} -m ${IRCDMODE} -o ${IRCDOWN} -g ${IRCDGRP} ircd ${BINDIR}/ircd
        ${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}; )
 
 uninstall:
        @if [ "${BINDIR}" != "${DPATH}" ]; then \