diff options
| author | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-06-01 01:26:15 +0000 |
|---|---|---|
| committer | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-06-01 01:26:15 +0000 |
| commit | 3954761f11af50ed33b88f1e6609bfa8a5dab750 (patch) | |
| tree | 5a7c085fca9a32548d9aceae64fc422aef070c89 /.Makefile.inc | |
| parent | 07483d2fecaf3b3d089bb378935e48f8afb2ca73 (diff) | |
Makefile updates: clean up command lines
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11395 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to '.Makefile.inc')
| -rw-r--r-- | .Makefile.inc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/.Makefile.inc b/.Makefile.inc index 1c5c77fb6..348051af9 100644 --- a/.Makefile.inc +++ b/.Makefile.inc @@ -24,16 +24,16 @@ endif CC = @CC@ FLAGS = $(NICEFLAGS) -pedantic LDLIBS = @LDLIBS@ -BASE = "$(DESTDIR)@BASE_DIR@" -CONPATH = "$(DESTDIR)@CONFIG_DIR@" -MODPATH = "$(DESTDIR)@MODULE_DIR@" -BINPATH = "$(DESTDIR)@BINARY_DIR@" -LAUNCHDPATH = "$(DESTDIR)/System/Library/LaunchDaemons" -LIBPATH = "$(DESTDIR)@LIBRARY_DIR@" +BASE = "@BASE_DIR@" +CONPATH = "@CONFIG_DIR@" +MODPATH = "@MODULE_DIR@" +BINPATH = "@BINARY_DIR@" +LAUNCHDPATH = "/System/Library/LaunchDaemons" +LIBPATH = "@LIBRARY_DIR@" MODULES = @MODULES@ INSTMODE = 0755 -MAKEFLAGS += --no-print-directory -MAKEARGS = 'FLAGS=${FLAGS}' 'NICEFLAGS=${NICEFLAGS}' 'CC=${CC}' 'LDLIBS=${LDLIBS}' 'MODULES=${MODULES}' 'MODPATH=${MODPATH}' 'LIBPATH=${LIBPATH}' 'INSTMODE=${INSTMODE}' +MAKEFLAGS += --no-print-directory -s +export FLAGS NICEFLAGS CC LDLIBS MODULES MODPATH LIBPATH INSTMODE all: ircd mods finishmessage @@ -65,10 +65,10 @@ std-header: @echo "*************************************" ircd: $(HEADER) - @${MAKE} -C src DIRNAME="src" $(MAKEARGS) + @${MAKE} -C src $(MAKEARGS) inspircd commands mods: $(HEADER) - @${MAKE} -C src/modules DIRNAME="src/modules" $(MAKEARGS) + @${MAKE} -C src/modules $(MAKEARGS) # Make this depend on 'ircd' and 'mods', so its always output last even with -j finishmessage: ircd mods @@ -80,7 +80,7 @@ finishmessage: ircd mods @echo "* make install *" @echo "*************************************" -install: all@EXTRA_DIR@ +install: ircd mods@EXTRA_DIR@ @-install -d -m $(INSTMODE) $(BASE) @-install -d -m $(INSTMODE) $(LIBPATH) @-install -d -m $(INSTMODE) $(BINPATH) @@ -98,7 +98,7 @@ install: all@EXTRA_DIR@ @echo "*************************************" module: - @${MAKE} -C src/modules DIRNAME="src/modules" $(MAKEARGS) ${name} + @${MAKE} -C src/modules $(MAKEARGS) ${name} clean: @echo Cleaning... |