about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2014-09-28 16:26:18 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2014-09-28 16:26:18 +0000
commitdb387b8673234dbd54dec967f61b276dcdffd62d (patch)
tree37b7574802f665c3c9a9392d6f32833e854124f5
parent5b69aaaa292d0733c7273de28550d02ad2094714 (diff)
downloadnetpbm-mirror-db387b8673234dbd54dec967f61b276dcdffd62d.tar.gz
netpbm-mirror-db387b8673234dbd54dec967f61b276dcdffd62d.tar.xz
netpbm-mirror-db387b8673234dbd54dec967f61b276dcdffd62d.zip
Fix missing newline in config.mk
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2296 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rwxr-xr-xbuildtools/configure.pl2
-rw-r--r--doc/HISTORY4
2 files changed, 5 insertions, 1 deletions
diff --git a/buildtools/configure.pl b/buildtools/configure.pl
index 44493ca1..078a7788 100755
--- a/buildtools/configure.pl
+++ b/buildtools/configure.pl
@@ -2386,7 +2386,7 @@ if ($platform eq "GNU") {
         push(@config_mk, "MSVCRT = Y\n");
     }
     if ($wantIcon) {
-        push(@config_mk, 'WINICON_OBJECT = $(BUILDDIR)/icon.netpbm.o');
+        push(@config_mk, 'WINICON_OBJECT = $(BUILDDIR)/icon.netpbm.o', "\n");
     }
 } elsif ($platform eq "BEOS") {
     push(@config_mk, "LDSHLIB = -nostart\n");
diff --git a/doc/HISTORY b/doc/HISTORY
index 4aeecf4b..659c0df6 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -6,6 +6,10 @@ CHANGE HISTORY
 
 not yet  BJH  Release 10.69.00
 
+              Windows build: fix universal build failure with "No rule to make
+              ...icon.netpbm.oLINKERISCOMPILER...".  Broken in Netpbm 10.67
+              (June 2014).
+
 14.09.26 BJH  Release 10.68.00
 
               pnmconvol: add -bias .