diff options
Diffstat (limited to 'scripts/makefile.s2x')
| -rw-r--r-- | scripts/makefile.s2x | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/makefile.s2x b/scripts/makefile.s2x index c54c021d2..3b3989737 100644 --- a/scripts/makefile.s2x +++ b/scripts/makefile.s2x @@ -6,6 +6,9 @@ CC=gcc +# where make install puts libpng.a, libpng.so*, and png.h +prefix=/usr/local + # Where the zlib library and include files are located # Changing these to ../zlib poses a security risk. If you want # to have zlib in an adjacent directory, specify the full path instead of "..". @@ -15,7 +18,6 @@ CC=gcc ZLIBLIB=/usr/local/lib ZLIBINC=/usr/local/include - WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wmissing-declarations -Wtraditional -Wcast-align \ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion @@ -29,11 +31,9 @@ RANLIB=echo # read libpng.txt or png.h to see why PNGMAJ is 2. You should not # have to change it. PNGMAJ = 2 -PNGMIN = 1.0.2 +PNGMIN = 1.0.2a PNGVER = $(PNGMAJ).$(PNGMIN) -# where make install puts libpng.a, libpng.so*, and png.h -prefix=/usr/local INCPATH=$(prefix)/include LIBPATH=$(prefix)/lib @@ -55,10 +55,10 @@ libpng.a: $(OBJS) $(RANLIB) $@ libpng.so: libpng.so.$(PNGMAJ) - ln -sf libpng.so.$(PNGMAJ) libpng.so + ln -s -f libpng.so.$(PNGMAJ) libpng.so libpng.so.$(PNGMAJ): libpng.so.$(PNGVER) - ln -sf libpng.so.$(PNGVER) libpng.so.$(PNGMAJ) + ln -s -f libpng.so.$(PNGVER) libpng.so.$(PNGMAJ) libpng.so.$(PNGVER): $(OBJSDLL) $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h libpng.so.$(PNGMAJ) \ @@ -77,8 +77,8 @@ install: libpng.a libpng.so.$(PNGVER) cp libpng.a libpng.so.$(PNGVER) $(LIBPATH) chmod 755 $(LIBPATH)/libpng.so.$(PNGVER) -@/bin/rm -f $(LIBPATH)/libpng.so.$(PNGMAJ) $(LIBPATH)/libpng.so - (cd $(LIBPATH); ln -sf libpng.so.$(PNGVER) libpng.so.$(PNGMAJ); \ - ln -sf libpng.so.$(PNGMAJ) libpng.so) + (cd $(LIBPATH); ln -s -f libpng.so.$(PNGVER) libpng.so.$(PNGMAJ); \ + ln -s -f libpng.so.$(PNGMAJ) libpng.so) clean: /bin/rm -f *.o libpng.a libpng.so* pngtest pngout.png |