aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Carl Worth <cworth@cworth.org>2009-12-01 08:34:09 -0800
committerGravatar Carl Worth <cworth@cworth.org>2009-12-01 08:34:09 -0800
commit98b93a7d5ad3713a7c408e497065cd0a931d90c7 (patch)
treecdad80d22f88c46b1f0d39d8788f10f1d811958b
parenteb0cf86c7a9d5cda464d4d36a9cac66f26b5529d (diff)
Remove Makefile.config from the repository.
Instead of shipping a default version, we now add a rule to automatically run configure if necessary to create Makefile.config.
-rw-r--r--.gitignore1
-rw-r--r--Makefile3
-rw-r--r--Makefile.config3
3 files changed, 4 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 8794354e..efa98fbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+Makefile.config
TAGS
tags
*cscope*
diff --git a/Makefile b/Makefile
index 2cd1b1ba..ae0f9912 100644
--- a/Makefile
+++ b/Makefile
@@ -35,6 +35,9 @@ include Makefile.local
include lib/Makefile.local
# And get user settings from the output of configure
+Makefile.config: configure
+ ./configure
+
include Makefile.config
# The user has not set any verbosity, default to quiet mode and inform the
diff --git a/Makefile.config b/Makefile.config
deleted file mode 100644
index ddc74365..00000000
--- a/Makefile.config
+++ /dev/null
@@ -1,3 +0,0 @@
-prefix = /usr/local
-bash_completion_dir = /etc/bash_completion.d
-CFLAGS += -DHAVE_VALGRIND