diff options
| author | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2007-01-04 21:32:53 +0000 |
|---|---|---|
| committer | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2007-01-04 21:32:53 +0000 |
| commit | 6c4d15a3a474a3a399ba3fd3e4039a15ca921c06 (patch) | |
| tree | 014c3d1714afe5ed1d87786e337269226936caf4 /.Makefile.inc | |
| parent | 79e7e5814463e295870e1ad85d6cc410ec8fde4e (diff) | |
Merge buildsystem tweaks from darix:
$ patch <inspircd-1.1b8_build_system.patch
$ patch <inspircd-1.1b8_mod_permissions.patch
Thanks :-)
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6225 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to '.Makefile.inc')
| -rw-r--r-- | .Makefile.inc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/.Makefile.inc b/.Makefile.inc index 1f2953fb6..826e61990 100644 --- a/.Makefile.inc +++ b/.Makefile.inc @@ -12,11 +12,11 @@ MAKE = @MAKEPROG@ PROGS = inspircd FLAGS = @FLAGS@ LDLIBS = @LDLIBS@ -BASE = @BASE_DIR@ -CONPATH = @CONFIG_DIR@ -MODPATH = @MODULE_DIR@ -BINPATH = @BINARY_DIR@ -LIBPATH = @LIBRARY_DIR@ +BASE = $(DESTDIR)@BASE_DIR@ +CONPATH = $(DESTDIR)@CONFIG_DIR@ +MODPATH = $(DESTDIR)@MODULE_DIR@ +BINPATH = $(DESTDIR)@BINARY_DIR@ +LIBPATH = $(DESTDIR)@LIBRARY_DIR@ MODULES = @MODULES@ STATICLIBS = @STATICLIBS@ INSTMODE = 0700 @@ -50,11 +50,11 @@ ircd: ${MAKE} -C src DIRNAME="src" $(MAKEARGS) install: all - @-mkdir -p ${BASE} - @-mkdir -p $(LIBPATH) - @-mkdir -p $(BINPATH) - @-mkdir -p $(CONPATH) - @-mkdir -p ${MODPATH} + @-install -d -m $(INSTMODE) ${BASE} + @-install -d -m $(INSTMODE) $(LIBPATH) + @-install -d -m $(INSTMODE) $(BINPATH) + @-install -d -m $(INSTMODE) $(CONPATH) + @-install -d -m $(INSTMODE) ${MODPATH} -install -m $(INSTMODE) src/libIRCDasyncdns.so $(LIBPATH) -install -m $(INSTMODE) src/libIRCDbase.so $(LIBPATH) -install -m $(INSTMODE) src/libIRCDchannels.so $(LIBPATH) |