aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2004-04-26 21:15:48 +0000
committerDaniel Stenberg <daniel@haxx.se>2004-04-26 21:15:48 +0000
commit372e7a6cd411f9350c67abee7066ee38c7d3ecf6 (patch)
treeef6e13eedc7d03b6870e1c8a55980c404a6c5dd6
parent211004bb0d12c1eb70ad70dccf9e0c4230c8deeb (diff)
Include "setup.h" and not "config.h" since setup.h is made to include
the correct config.h for the platform, and when this is done the USE_MANUAL define is properly known.
-rw-r--r--src/Makefile.am8
-rw-r--r--src/mkhelp.pl4
2 files changed, 3 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index c5af70251..1008ae63a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -63,9 +63,7 @@ if USE_MANUAL
if HAVE_LIBZ
# This generates the hugehelp.c file in both uncompressed and compressed formats
$(HUGE): $(README) $(MANPAGE) mkhelp.pl
- echo '#ifdef HAVE_CONFIG_H' > $(HUGE)
- echo '#include "config.h"' >> $(HUGE)
- echo '#endif' >> $(HUGE)
+ echo '#include "setup.h"' > $(HUGE)
echo '#ifndef HAVE_LIBZ' >> $(HUGE)
$(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> $(HUGE)
echo '#else' >> $(HUGE)
@@ -74,9 +72,7 @@ $(HUGE): $(README) $(MANPAGE) mkhelp.pl
else # HAVE_LIBZ
# This generates the hugehelp.c file uncompressed only
$(HUGE): $(README) $(MANPAGE) mkhelp.pl
- echo '#ifdef HAVE_CONFIG_H' > $(HUGE)
- echo '#include "config.h"' >> $(HUGE)
- echo '#endif' >> $(HUGE)
+ echo '#include "setup.h"' > $(HUGE)
$(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> $(HUGE)
endif
diff --git a/src/mkhelp.pl b/src/mkhelp.pl
index 195328edf..318e5986d 100644
--- a/src/mkhelp.pl
+++ b/src/mkhelp.pl
@@ -112,9 +112,7 @@ print <<HEAD
* NEVER EVER edit this manually, fix the mkhelp.pl script instead!
* Generation time: $now
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "setup.h"
#ifdef USE_MANUAL
#include "hugehelp.h"
#include <stdio.h>