summaryrefslogtreecommitdiffstats
path: root/linux
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2005-08-15 09:41:05 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2005-08-15 09:41:05 +0000
commitd64af2b712edb4809d1b3c4c1c10f36f68f53723 (patch)
tree9886a826b2f58dfd650f3dca966660d4d2d4184b /linux
parent39d82a5ab73ecf31890c8719d5068ef1a2e98ef3 (diff)
downloadrsyslog-d64af2b712edb4809d1b3c4c1c10f36f68f53723.tar.gz
rsyslog-d64af2b712edb4809d1b3c4c1c10f36f68f53723.tar.xz
rsyslog-d64af2b712edb4809d1b3c4c1c10f36f68f53723.zip
more makefile changes (trying to make it bulletproof)
Diffstat (limited to 'linux')
-rw-r--r--linux/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/Makefile b/linux/Makefile
index 0be949d9..e7a23fda 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -25,7 +25,7 @@ FEATURE_LARGEFILE=1
# Enable database support (off by default, must be turned
# on when support for MySQL is desired).
-FEATURE_DB=1
+FEATURE_DB=0
#############################################################
# END OF USER SETTINGS #
@@ -52,4 +52,4 @@ LIBS = -lmysqlclient -L/usr/local/lib/mysql
endif
VPATH = ../
-include ../Makefile
+include ../master.make