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.

diff --git a/.gitignore b/.gitignore
index 8794354e547115484fd0fd2d99ae2496d88c9cda..efa98fbbe03db365f815fa9c1107f792af5172b0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+Makefile.config
 TAGS
 tags
 *cscope*

diff --git a/Makefile b/Makefile
index 2cd1b1bae4af648b07b51a110e08f623868fa66e..ae0f99120cc59c459c3b8d0e4819611e7c8b5c62 100644 (file)
--- 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 (file)
index ddc7436..0000000
--- a/Makefile.config
+++ /dev/null
@@ -1,3 +0,0 @@
-prefix = /usr/local
-bash_completion_dir = /etc/bash_completion.d
-CFLAGS += -DHAVE_VALGRIND