[BACK]Return to patch-Makefile CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / print / foo2zjs / patches

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /pkgsrc/print/foo2zjs/patches/patch-Makefile between version 1.3 and 1.4

version 1.3, 2014/09/24 13:44:21 version 1.4, 2015/07/28 16:42:03
Line 7  actually test for -e support.  Just remo
Line 7  actually test for -e support.  Just remo
   
 --- Makefile.orig       2012-06-01 23:10:31.000000000 +0000  --- Makefile.orig       2012-06-01 23:10:31.000000000 +0000
 +++ Makefile  +++ Makefile
 @@ -17,9 +17,7 @@ SYSNAME := $(shell uname -n)  @@ -17,9 +17,8 @@ SYSNAME := $(shell uname -n)
  VERSION=0.0   VERSION=0.0
   
  # Installation prefix...   # Installation prefix...
Line 15  actually test for -e support.  Just remo
Line 15  actually test for -e support.  Just remo
 -PREFIX=/usr  -PREFIX=/usr
 -PREFIX=$(DESTDIR)/usr  -PREFIX=$(DESTDIR)/usr
 +PREFIX=@PREFIX@  +PREFIX=@PREFIX@
   +RUNPREFIX=@RUNPREFIX@
   
  # Pathnames for this package...   # Pathnames for this package...
  BIN=$(PREFIX)/bin   BIN=$(PREFIX)/bin
 @@ -31,7 +29,7 @@ SHARELAVA=$(PREFIX)/share/foo2lava  @@ -31,7 +30,7 @@ SHARELAVA=$(PREFIX)/share/foo2lava
  SHAREQPDL=$(PREFIX)/share/foo2qpdl   SHAREQPDL=$(PREFIX)/share/foo2qpdl
  SHARESLX=$(PREFIX)/share/foo2slx   SHARESLX=$(PREFIX)/share/foo2slx
  SHAREHC=$(PREFIX)/share/foo2hiperc   SHAREHC=$(PREFIX)/share/foo2hiperc
Line 27  actually test for -e support.  Just remo
Line 28  actually test for -e support.  Just remo
  DOCDIR=$(PREFIX)/share/doc/foo2zjs/   DOCDIR=$(PREFIX)/share/doc/foo2zjs/
  INSTALL=install   INSTALL=install
  ROOT=root   ROOT=root
 @@ -58,7 +56,7 @@ endif  @@ -58,7 +57,7 @@ endif
  ifeq ($(UNAME),SunOS)   ifeq ($(UNAME),SunOS)
      LPuid=-oroot       LPuid=-oroot
      LPgid=-glp       LPgid=-glp
Line 36  actually test for -e support.  Just remo
Line 37  actually test for -e support.  Just remo
  endif   endif
  # If we aren't root, don't try to set ownership   # If we aren't root, don't try to set ownership
  ifneq ($(EUID),0)   ifneq ($(EUID),0)
 @@ -409,12 +407,6 @@ all-test:  @@ -409,12 +408,6 @@ all-test:
             echo "      ***"; \              echo "      ***"; \
             exit 1; \              exit 1; \
         fi          fi
Line 49  actually test for -e support.  Just remo
Line 50  actually test for -e support.  Just remo
  ifeq ($(UNAME),Darwin)   ifeq ($(UNAME),Darwin)
         @if ! type gsed >/dev/null 2>&1; then \          @if ! type gsed >/dev/null 2>&1; then \
             echo "      ***"; \              echo "      ***"; \
   @@ -469,55 +462,55 @@ foo2hiperc: foo2hiperc.o $(LIBJBG)
    foo2zjs-wrapper: foo2zjs-wrapper.in Makefile
           [ ! -f $@ ] || chmod +w $@
           sed < $@.in > $@ \
   -           -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
   +           -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
           chmod 555 $@
   
    foo2hp2600-wrapper: foo2hp2600-wrapper.in Makefile
           [ ! -f $@ ] || chmod +w $@
           sed < $@.in > $@ \
   -           -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
   +           -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
           chmod 555 $@
   
    foo2xqx-wrapper: foo2xqx-wrapper.in Makefile
           [ ! -f $@ ] || chmod +w $@
           sed < $@.in > $@ \
   -           -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
   +           -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
           chmod 555 $@
   
    foo2lava-wrapper: foo2lava-wrapper.in Makefile
           [ ! -f $@ ] || chmod +w $@
           sed < $@.in > $@ \
   -           -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
   +           -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
           chmod 555 $@
   
    foo2qpdl-wrapper: foo2qpdl-wrapper.in Makefile
           [ ! -f $@ ] || chmod +w $@
           sed < $@.in > $@ \
   -           -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
   +           -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
           chmod 555 $@
   
    foo2oak-wrapper: foo2oak-wrapper.in Makefile
           [ ! -f $@ ] || chmod +w $@
           sed < $@.in > $@ \
   -           -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
   +           -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
           chmod 555 $@
   
    foo2slx-wrapper: foo2slx-wrapper.in Makefile
           [ ! -f $@ ] || chmod +w $@
           sed < $@.in > $@ \
   -           -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
   +           -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
           chmod 555 $@
   
    foo2hiperc-wrapper: foo2hiperc-wrapper.in Makefile
           [ ! -f $@ ] || chmod +w $@
           sed < $@.in > $@ \
   -           -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
   +           -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
           chmod 555 $@
   
    foo2zjs-wrapper9: foo2zjs-wrapper9.in Makefile
           [ ! -f $@ ] || chmod +w $@
           sed < $@.in > $@ \
   -           -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
   +           -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
           chmod 555 $@
   
   
Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4
CVSweb <webmaster@jp.NetBSD.org>