From 68ed7aee776bcbc7e709fa1cd095ec147973d80b Mon Sep 17 00:00:00 2001 From: stskeeps Date: Wed, 25 Apr 2007 17:01:44 +0000 Subject: [PATCH] - #0003294 reported by Bock, patched by aegis regarding a problem with make install, that also cleans up the stuff to install a bit, with adding a variable to determine what should be copied. --- Changes | 5 +++-- Makefile.in | 11 +++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Changes b/Changes index 40ad72ca5..5dd43cffd 100644 --- a/Changes +++ b/Changes @@ -1622,5 +1622,6 @@ MOTDs - #0003000 reported and patched by Stealth, regarding Send TKL updates to G snomask - #0003288 patched by fbi, read error prefix in quit msg if socket error on read and write for write - - +- #0003294 reported by Bock, patched by aegis regarding a problem with make + install, that also cleans up the stuff to install a bit, with adding a + variable to determine what should be copied. diff --git a/Makefile.in b/Makefile.in index d75d79924..10ae9229a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -134,6 +134,13 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'IRCDLIBS=${IRCDLIBS}' \ 'CRYPTOINCLUDES=${CRYPTOINCLUDES}' \ 'URL=${URL}' +INSTALL_CONFS = badwords.channel.conf badwords.message.conf \ + badwords.quit.conf dccallow.conf help.conf \ + spamfilter.conf LICENSE Donation + +INSTALL_DOCS = doc/Authors doc/example.conf doc/coding-guidelines \ + doc/tao.of.irc doc/unreal32docs.html + custommodule: cd src; ${MAKE} ${MAKEARGS} MODULEFILE=${MODULEFILE} 'EXLIBS=${EXLIBS}' custommodule @@ -206,12 +213,12 @@ install: all $(INSTALL) -m 0700 -d $(BINDIR) $(INSTALL) -m 0700 src/ircd $(BINDIR) $(INSTALL) -m 0700 -d $(IRCDDIR)/doc - $(INSTALL) -m 0600 doc/Authors doc/example.conf doc/coding-guidelines doc/tao.of.irc doc/unreal32docs.html $(IRCDDIR)/doc + $(INSTALL) -m 0600 $(INSTALL_DOCS) $(IRCDDIR)/doc $(INSTALL) -m 0700 -d $(IRCDDIR)/aliases $(INSTALL) -m 0600 aliases/*.conf $(IRCDDIR)/aliases $(TOUCH) $(IRCDDIR)/unrealircd.conf chmod 0600 $(IRCDDIR)/unrealircd.conf - $(INSTALL) -m 0600 *.conf help.conf LICENSE Donation $(IRCDDIR) + $(INSTALL) -m 0600 $(INSTALL_CONFS) $(IRCDDIR) $(INSTALL) -m 0700 unreal $(IRCDDIR) $(INSTALL) -m 0700 -d $(IRCDDIR)/modules $(INSTALL) -m 0700 src/modules/*.so $(IRCDDIR)/modules