diff options
| -rw-r--r-- | GNUmakefile | 10 | ||||
| -rwxr-xr-x | buildtools/configure.pl | 6 | ||||
| -rw-r--r-- | config.mk.in | 12 | ||||
| -rw-r--r-- | lib/Makefile | 2 |
4 files changed, 15 insertions, 15 deletions
diff --git a/GNUmakefile b/GNUmakefile index 527d1a15..b0b7f005 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -396,19 +396,19 @@ lib/install.hdr: $(MAKE) -C $(dir $@) -f $(SRCDIR)/lib/Makefile \ SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@) -ifeq ($(STATICLIB_TOO),y) -BUILD_STATIC = y +ifeq ($(STATICLIB_TOO),Y) +BUILD_STATIC = Y else ifeq ($(NETPBMLIBTYPE),unixstatic) - BUILD_STATIC = y + BUILD_STATIC = Y else - BUILD_STATIC = n + BUILD_STATIC = N endif endif .PHONY: install.staticlib install.staticlib: -ifeq ($(BUILD_STATIC),y) +ifeq ($(BUILD_STATIC),Y) $(MAKE) -C lib -f $(SRCDIR)/lib/Makefile \ SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) install.staticlib endif diff --git a/buildtools/configure.pl b/buildtools/configure.pl index d4e9bee3..056b705d 100755 --- a/buildtools/configure.pl +++ b/buildtools/configure.pl @@ -835,16 +835,16 @@ sub getLibTypes($$$$$$$$) { my $response = prompt("(y)es or (n)o", $default); if (uc($response) =~ /^(Y|YES)$/) { - $staticlib_too = "y"; + $staticlib_too = "Y"; } elsif (uc($response) =~ /^(N|NO)$/) { - $staticlib_too = "n"; + $staticlib_too = "N"; } else { print("'$response' isn't one of the choices. \n" . "You must choose 'yes' or 'no' (or 'y' or 'n').\n"); exit 12; } } else { - $staticlib_too = "n"; + $staticlib_too = "N"; } print("\n"); diff --git a/config.mk.in b/config.mk.in index bc1d2804..7760bfb5 100644 --- a/config.mk.in +++ b/config.mk.in @@ -503,7 +503,7 @@ LINUXSVGAHDR_DIR = #LINUXSVGALIB = /usr/lib/libvga.so #LINUXSVGAHDR_DIR = /usr/include/vgalib -# If you don't want any network functions, set OMIT_NETWORK to "y". +# If you don't want any network functions, set OMIT_NETWORK to "Y". # The only thing that requires network functions is the option in # ppmtompeg to run it on multiple computers simultaneously. On some # systems network functions don't work or we haven't figured out how to @@ -512,11 +512,11 @@ OMIT_NETWORK = #DJGPP/Windows, Tru64: # (there's some minor header problem that prevents network functions from # building on Tru64 2000.10.06) -#OMIT_NETWORK = y +#OMIT_NETWORK = Y # These are -l options to link in the network libraries. Often, these are # built into the standard C library, so this can be null. This is irrelevant -# if OMIT_NETWORK is "y". +# if OMIT_NETWORK is "Y". NETWORKLD = # Solaris, SunOS: @@ -602,12 +602,12 @@ NETPBMLIBSUFFIX = so # Windows shared library: #NETPBMLIBSUFFIX = dll -#STATICLIB_TOO is "y" to signify that you want a static library built +#STATICLIB_TOO is "Y" to signify that you want a static library built #and installed in addition to whatever library type you specified by #NETPBMLIBTYPE. If NETPBMLIBTYPE specified a static library, #STATICLIB_TOO simply has no effect. -STATICLIB_TOO = y -#STATICLIB_TOO = n +STATICLIB_TOO = Y +#STATICLIB_TOO = N #STATICLIBSUFFIX is the suffix that static libraries have. It's #meaningless if you aren't building static libraries. diff --git a/lib/Makefile b/lib/Makefile index d5f47813..b47c3aae 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -175,7 +175,7 @@ else ifeq ($(STATICLIB_TOO),Y) BUILD_STATICLIB = Y else - BUILD_STATICLIB = n + BUILD_STATICLIB = N endif endif |