diff options
Diffstat (limited to 'buildtools')
-rwxr-xr-x | buildtools/configure.pl | 18 | ||||
-rwxr-xr-x | buildtools/debian/mkdeb | 6 | ||||
-rw-r--r-- | buildtools/manpage.mk | 6 |
3 files changed, 24 insertions, 6 deletions
diff --git a/buildtools/configure.pl b/buildtools/configure.pl index 056b705d..44493ca1 100755 --- a/buildtools/configure.pl +++ b/buildtools/configure.pl @@ -1048,6 +1048,19 @@ sub getSse($) { } +sub getIcon($$) { + + my ($platform, $wantIconR) = @_; + + if ($platform eq 'WINDOWS') { + print("Include an icon in each executable?\n"); + $$wantIconR = promptYesNo("y"); + } else { + $$wantIconR = $FALSE; + } +} + + # TODO: These should do test compiles to see if the headers are in the # default search path, both to create a default to offer and to issue a @@ -2082,6 +2095,8 @@ getSse(\my $wantSse); findProcessManagement(\my $dontHaveProcessMgmt); +getIcon($platform, \my $wantIcon); + #****************************************************************************** # # FIND THE PREREQUISITE LIBRARIES @@ -2370,6 +2385,9 @@ if ($platform eq "GNU") { if ($subplatform ne "cygwin") { push(@config_mk, "MSVCRT = Y\n"); } + if ($wantIcon) { + push(@config_mk, 'WINICON_OBJECT = $(BUILDDIR)/icon.netpbm.o'); + } } elsif ($platform eq "BEOS") { push(@config_mk, "LDSHLIB = -nostart\n"); } elsif ($platform eq "OPENBSD") { diff --git a/buildtools/debian/mkdeb b/buildtools/debian/mkdeb index 9c7b1735..42a986eb 100755 --- a/buildtools/debian/mkdeb +++ b/buildtools/debian/mkdeb @@ -133,12 +133,12 @@ sub control($$) { $control{'Installed-Size'} = '6164'; $control{'Depends'} = 'libc6, ' . - 'libjpeg8, ' . + 'libjpeg62, ' . 'libpng12-0, ' . 'libsvga1, ' . - 'libtiff5, ' . + 'libtiff4, ' . 'libx11-6, ' . - 'libxml2a, ' . + 'libxml2, ' . 'zlib1g, ' . 'ghostscript, ' . 'perl, ' . diff --git a/buildtools/manpage.mk b/buildtools/manpage.mk index e1c0bce2..47d890c3 100644 --- a/buildtools/manpage.mk +++ b/buildtools/manpage.mk @@ -354,7 +354,7 @@ MAN5 = \ ppm.5 \ # These things do get converted to man pages and installed. -MANPAGES = $(MAN1) netpbm.1 $(MAN3) $(MAN5) +MANPAGES = netpbm.1 $(MAN1) $(MAN3) $(MAN5) HTMLMANUALS = $(MAN1:.1=.html) $(MAN3:.3=.html) $(MAN5:.5=.html) # These things don't get converted to manual pages. @@ -388,13 +388,13 @@ xmlpages: # This will install the generated man pages installman: set -x - for f in $(MAN1); do if [ -f $$f ]; then gzip <$$f >$(MANDIR)/man1/$$f.gz; fi; done + for f in netpbm.1 $(MAN1); do if [ -f $$f ]; then gzip <$$f >$(MANDIR)/man1/$$f.gz; fi; done for f in $(MAN3); do if [ -f $$f ]; then gzip <$$f >$(MANDIR)/man3/$$f.gz; fi; done for f in $(MAN5); do if [ -f $$f ]; then gzip <$$f >$(MANDIR)/man5/$$f.gz; fi; done # This will uninstall them uninstallman: - for f in $(MAN1); do rm -f $(MANDIR)/man1/$$f.gz; fi; done + for f in netpbm.1 $(MAN1); do rm -f $(MANDIR)/man1/$$f.gz; fi; done for f in $(MAN3); do rm -f $(MANDIR)/man3/$$f.gz; fi; done for f in $(MAN5); do rm -f $(MANDIR)/man5/$$f.gz; fi; done |