diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-04-16 22:12:45 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-04-16 22:12:45 +0200 |
| commit | 0d9217127f3e81fa19037f4923949b10443c5f1d (patch) | |
| tree | adcc63965ca20b96d27e1b2a0683c89205766922 /nx-X11/lib/Xrender | |
| parent | cfc0202b42ad307391202ca776937b28ea7d2b03 (diff) | |
| parent | 422fe90717dde8ee451f37f29a11b0b4c319210c (diff) | |
| download | nx-libs-0d9217127f3e81fa19037f4923949b10443c5f1d.tar.gz nx-libs-0d9217127f3e81fa19037f4923949b10443c5f1d.tar.bz2 nx-libs-0d9217127f3e81fa19037f4923949b10443c5f1d.zip | |
Merge branch 'sunweaver-pr/xcursor-cleanup' into arctica-3.6.x
Attributes GH PR #13: https://github.com/ArcticaProject/nx-libs/pull/13
Diffstat (limited to 'nx-X11/lib/Xrender')
| -rw-r--r-- | nx-X11/lib/Xrender/Imakefile | 2 | ||||
| -rw-r--r-- | nx-X11/lib/Xrender/config-subst | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/nx-X11/lib/Xrender/Imakefile b/nx-X11/lib/Xrender/Imakefile index c4fd0aa67..86ac94f3e 100644 --- a/nx-X11/lib/Xrender/Imakefile +++ b/nx-X11/lib/Xrender/Imakefile @@ -159,7 +159,7 @@ all:: xrender.pc xrender.pc: xrender.pc.in RemoveFile($@) - sh ../Xcursor/config-subst $(SUBSTVARS) < xrender.pc.in > $@ + sh config-subst $(SUBSTVARS) < xrender.pc.in > $@ InstallNonExecFile(xrender.pc,$(USRLIBDIR)/pkgconfig) diff --git a/nx-X11/lib/Xrender/config-subst b/nx-X11/lib/Xrender/config-subst new file mode 100644 index 000000000..5907e0328 --- /dev/null +++ b/nx-X11/lib/Xrender/config-subst @@ -0,0 +1,10 @@ +#!/bin/sh +script=config-subst.$$ +trap "rm $script" 0 +rm -f $script +for i in ${1+"$@"}; do + var="`echo "$i" | sed 's/=.*$//'`" + val="`echo "$i" | sed 's/^[^=]*=//'`" + echo "s;@$var@;$val;" >> $script +done +sed -f $script |