|
|
a158709 |
#! /bin/sh /usr/share/dpatch/dpatch-run
|
|
|
a158709 |
## 125-fix-PLINAME-creation.dpatch by Kevin B. McCarty <kmccarty@debian.org>
|
|
|
a158709 |
##
|
|
|
a158709 |
## All lines beginning with `## DP:' are a description of the patch.
|
|
|
a158709 |
## DP: Fix creation of PLINAME Make variable so that -DDEBIAN_VERSION=...
|
|
|
a158709 |
## DP: will not get incorporated into it (confusing patchy).
|
|
|
a158709 |
|
|
|
a158709 |
@DPATCH@
|
|
|
a158709 |
diff -urNad cernlib-2006.dfsg.2~/src/patchy/Imakefile cernlib-2006.dfsg.2/src/patchy/Imakefile
|
|
|
a158709 |
--- cernlib-2006.dfsg.2~/src/patchy/Imakefile 2006-09-06 07:36:54.000000000 -0700
|
|
|
a158709 |
+++ cernlib-2006.dfsg.2/src/patchy/Imakefile 2008-02-26 13:13:47.000000000 -0800
|
|
|
a158709 |
@@ -49,7 +49,7 @@
|
|
|
a158709 |
comma:= ,
|
|
|
a158709 |
empty:=
|
|
|
a158709 |
space:= $(empty) $(empty)
|
|
|
a158709 |
-PLINAME=$(subst $(space),$(comma),$(strip $(subst -DCERNLIB_,,CernlibSystem)))
|
|
|
a158709 |
+PLINAME=$(subst $(space),$(comma),$(strip $(subst -DCERNLIB_,,$(filter -DCERNLIB_%,CernlibSystem))))
|
|
|
a158709 |
LDIR=$(TOP)$(CURRENT_DIR)/
|
|
|
a158709 |
|
|
|
a158709 |
$(P5LIB): $(LDIR)patchy.car $(LDIR)p5lib.cra p5lib.libmake fcasplit Makefile
|
|
|
a158709 |
@@ -114,7 +114,7 @@
|
|
|
a158709 |
|
|
|
a158709 |
#ifdef CERNLIB_VAXVMS
|
|
|
a158709 |
|
|
|
a158709 |
-PLINAME=$(subst $(space),$(comma),$(strip $(subst -DCERNLIB_,,CernlibSystem)))
|
|
|
a158709 |
+PLINAME=$(subst $(space),$(comma),$(strip $(subst -DCERNLIB_,,$(filter -DCERNLIB_%,CernlibSystem))))
|
|
|
a158709 |
LDIR=$(TOP)$(CURRENT_DIR)]
|
|
|
a158709 |
|
|
|
a158709 |
%.for: %.cra patchy.car yyexpand.com
|