summaryrefslogtreecommitdiff
path: root/src/protocol
diff options
context:
space:
mode:
authorcyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864>2008-12-29 20:07:55 +0000
committercyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864>2008-12-29 20:07:55 +0000
commitbd2cb095aa686c3bf0f662c0029687645142ea9e (patch)
tree875737760f27ce0236884d0805db9b4b00f58046 /src/protocol
parentd6bb55476c9aa4771e2b7f24cee05325a1df4117 (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/protocol')
-rw-r--r--src/protocol/Makefile10
-rw-r--r--src/protocol/Makefile.sub4
2 files changed, 7 insertions, 7 deletions
diff --git a/src/protocol/Makefile b/src/protocol/Makefile
index b1db60771..1a064000c 100644
--- a/src/protocol/Makefile
+++ b/src/protocol/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}'
@@ -17,8 +17,8 @@ all: modules subs
modules: $(OBJECTS) $(SO_FILES)
-install:
- $(CP) ./*.so $(MODULE_PATH)
+install:
+ $(CP) ./*.so $(INSTDIR)/data/modules
distclean: clean spotless
diff --git a/src/protocol/Makefile.sub b/src/protocol/Makefile.sub
index 9fd25dc0c..12502d87e 100644
--- a/src/protocol/Makefile.sub
+++ b/src/protocol/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)