summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2011-04-21 19:36:52 +0100
committerIan Lynagh <igloo@earth.li>2011-04-21 22:48:10 +0100
commitf3a77b2f46ebc27716f45ae426a3b33b853d52f5 (patch)
treebe7fcec319ab3210f6d0769d9367c3aa987eef93 /distrib
parent70f79a6c3c40ca95efc1e2371f663c68c3bb5f08 (diff)
downloadhaskell-f3a77b2f46ebc27716f45ae426a3b33b853d52f5.tar.gz
Rename "extra-gcc-opts" to "settings", and start generalising it
Diffstat (limited to 'distrib')
-rw-r--r--distrib/Makefile2
-rw-r--r--distrib/configure.ac.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/distrib/Makefile b/distrib/Makefile
index f1d63bc28e..7f8add1f50 100644
--- a/distrib/Makefile
+++ b/distrib/Makefile
@@ -34,7 +34,7 @@ install::
$(MAKE) -C gmp install DOING_BIN_DIST=YES
$(MAKE) -C docs install-docs DOING_BIN_DIST=YES
$(MAKE) -C libraries/Cabal/doc install-docs DOING_BIN_DIST=YES
- $(INSTALL_DATA) $(INSTALL_OPTS) extra-gcc-opts $(libdir)
+ $(INSTALL_DATA) $(INSTALL_OPTS) settings $(libdir)
install :: postinstall denounce
diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in
index d5aa2be68d..e54839f0d5 100644
--- a/distrib/configure.ac.in
+++ b/distrib/configure.ac.in
@@ -88,7 +88,7 @@ dnl ** how to invoke `ar' and `ranlib'
FP_PROG_AR_NEEDS_RANLIB
#
-AC_CONFIG_FILES(extra-gcc-opts mk/config.mk mk/install.mk)
+AC_CONFIG_FILES(settings mk/config.mk mk/install.mk)
AC_OUTPUT
# We get caught by