Commit 372e7a6c authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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.
parent 211004bb

src/Makefile.am

+2 −6
Original line number Diff line number Diff line
@@ -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

src/mkhelp.pl

+1 −3
Original line number Diff line number Diff line
@@ -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>