diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/Makefile | 10 | ||||
| -rw-r--r-- | src/modules/Makefile.sub | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/modules/Makefile b/src/modules/Makefile index dce685230..c964439a8 100644 --- a/src/modules/Makefile +++ b/src/modules/Makefile @@ -1,10 +1,10 @@ include ./Makefile.inc MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \ - 'LDFLAGS=${LDFLAGS}' 'BINDEST=${BINDEST}' 'INSTALL=${INSTALL}' \ + 'LDFLAGS=${LDFLAGS}' 'INSTDIR=${INSTDIR}' 'INSTALL=${INSTALL}' \ 'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \ - 'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \ - 'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \ + 'TOUCH=${TOUCH}' 'SHELL=${SHELL}' \ + 'RUNGROUP=${RUNGROUP}' \ 'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'\ 'MAKEBIN=${MAKEBIN}' @@ -16,8 +16,8 @@ all: modules subs modules: $(OBJECTS) $(SO_FILES) -install: - $(CP) ./*.so $(MODULE_PATH) +install: + $(CP) ./*.so $(INSTDIR)/data/modules @for i in $(SUBS); do \ echo "make install in $$i..."; \ (cd $$i; $(MAKE) $(MAKEARGS) install);done diff --git a/src/modules/Makefile.sub b/src/modules/Makefile.sub index 7697249bf..d9011d602 100644 --- a/src/modules/Makefile.sub +++ b/src/modules/Makefile.sub @@ -1,8 +1,8 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \ - 'LDFLAGS=${LDFLAGS}' 'BINDEST=${BINDEST}' 'INSTALL=${INSTALL}' \ + 'LDFLAGS=${LDFLAGS}' 'INSTDIR=${INSTDIR}' 'INSTALL=${INSTALL}' \ 'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \ 'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \ - 'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \ + 'RUNGROUP=${RUNGROUP}' \ 'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}' OBJECTS= $(SRCS:.c=.o) |