]> granicus.if.org Git - curl/commitdiff
projects / curl / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 211004b)
Include "setup.h" and not "config.h" since setup.h is made to include
authorDaniel Stenberg <daniel@haxx.se>
Mon, 26 Apr 2004 21:15:48 +0000 (21:15 +0000)
committerDaniel Stenberg <daniel@haxx.se>
Mon, 26 Apr 2004 21:15:48 +0000 (21:15 +0000)
the correct config.h for the platform, and when this is done the USE_MANUAL
define is properly known.

src/Makefile.am patch | blob | history
src/mkhelp.pl patch | blob | history

diff --git a/src/Makefile.am b/src/Makefile.am
index c5af7025117cf12fef3288f77be619024980bdd1..1008ae63abaeb11c095c9f2c5638605dcea1b7c7 100644 (file)
--- 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 195328edf65635a1a82f5a726319e3505c3f9631..318e5986dfb51b646d7b8fef1f5b3423e206fafe 100644 (file)
--- 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>
Unnamed repository; edit this file 'description' to name the repository.