diff options
| -rw-r--r-- | .Makefile.inc | 20 | ||||
| -rwxr-xr-x | configure | 2 |
2 files changed, 11 insertions, 11 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) @@ -1567,7 +1567,7 @@ m_$i.so: m_$i.cpp ../../include/modules.h ../../include/users.h ../../include/ch \$(CC) -pipe \$(FLAGS) -shared $liflags -o m_$i.so m_$i.o $extra EOCHEESE - $crud = $crud . " install -m 0700 m_$i.so \$(MODPATH)\n"; + $crud = $crud . " install -m \$(INSTMODE) m_$i.so \$(MODPATH)\n"; ### # End Write Entry to the MakeFile ### |