diff options
| author | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-12-29 20:07:55 +0000 |
|---|---|---|
| committer | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-12-29 20:07:55 +0000 |
| commit | bd2cb095aa686c3bf0f662c0029687645142ea9e (patch) | |
| tree | 875737760f27ce0236884d0805db9b4b00f58046 /src/core | |
| parent | d6bb55476c9aa4771e2b7f24cee05325a1df4117 (diff) | |
Modifications to the Autotools build system to try to make it work with the changes made from CMake, still untested (again, don't use this commit).
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1877 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Makefile | 10 | ||||
| -rw-r--r-- | src/core/Makefile.sub | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/core/Makefile b/src/core/Makefile index 1fba36e5e..f4df49581 100644 --- a/src/core/Makefile +++ b/src/core/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 distclean: spotless diff --git a/src/core/Makefile.sub b/src/core/Makefile.sub index 9fbadf3b0..7b1099b37 100644 --- a/src/core/Makefile.sub +++ b/src/core/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) |