diff options
author | Daniel Stenberg <daniel@haxx.se> | 2004-01-29 15:48:27 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2004-01-29 15:48:27 +0000 |
commit | f50678eda7977ec5b1e584ef03957d46b6053403 (patch) | |
tree | a084ee46f5beb73b176c3d21ee2d1c2709ee9bba | |
parent | 3ded81188b35de8575af7b820e429c89a6e9f125 (diff) |
don't include config.g in src/hugehelp.c unless HAVE_CONFIG_H is defined
-rw-r--r-- | CHANGES | 3 | ||||
-rw-r--r-- | src/Makefile.am | 21 |
2 files changed, 15 insertions, 9 deletions
@@ -7,6 +7,9 @@ Changelog Daniel(29 January 2004) +- Stadler Stephan pointed out that src/hugehelp.c included config.h without + checking the define if its present... + - Ken Hirsch provided patches to make curl build fine on the MPE/iX operating system. diff --git a/src/Makefile.am b/src/Makefile.am index 305ed721e..2da8e896e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -51,18 +51,21 @@ EXTRA_DIST = mkhelp.pl curlmsg.msg makefile.dj \ MANPAGE=$(top_srcdir)/docs/curl.1 README=$(top_srcdir)/docs/MANUAL MKHELP=$(top_srcdir)/src/mkhelp.pl +HUGE=hugehelp.c if HAVE_LIBZ # This generates the hugehelp.c file in both uncompressed and compressed formats -hugehelp.c: $(README) $(MANPAGE) mkhelp.pl - echo '#include "config.h"' > hugehelp.c - echo '#ifndef HAVE_LIBZ' >> hugehelp.c - $(NROFF) -man $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> hugehelp.c - echo '#else' >> hugehelp.c - $(NROFF) -man $(MANPAGE) | $(PERL) $(MKHELP) -c $(README) >> hugehelp.c - echo '#endif /* HAVE_LIBZ */' >> hugehelp.c +$(HUGE): $(README) $(MANPAGE) mkhelp.pl + echo '#ifdef HAVE_CONFIG_H' > $(HUGE) + echo '#include "config.h"' >> $(HUGE) + echo '#endif' >> $(HUGE) + echo '#ifndef HAVE_LIBZ' >> $(HUGE) + $(NROFF) -man $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> $(HUGE) + echo '#else' >> $(HUGE) + $(NROFF) -man $(MANPAGE) | $(PERL) $(MKHELP) -c $(README) >> $(HUGE) + echo '#endif /* HAVE_LIBZ */' >> $(HUGE) else # This generates the hugehelp.c file uncompressed only -hugehelp.c: $(README) $(MANPAGE) mkhelp.pl - $(NROFF) -man $(MANPAGE) | $(PERL) $(MKHELP) $(README) > hugehelp.c +$(HUGE): $(README) $(MANPAGE) mkhelp.pl + $(NROFF) -man $(MANPAGE) | $(PERL) $(MKHELP) $(README) > $(HUGE) endif |