summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-04-28 07:34:59 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-04-28 07:34:59 +0000
commit875290e479d65ddad4310f0ea57b4d686d5da9f7 (patch)
treeb109d1d3f4ff941c78267eb559d8bbf502627291
parent432100c33f1a0080658c0b4de4d3b62e2f6a303e (diff)
texlive/tl_scripts: Simplify Makefile.am '/..'=> ''
git-svn-id: svn://tug.org/texlive/trunk@30145 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/texlive/tl_scripts/ChangeLog4
-rw-r--r--Build/source/texk/texlive/tl_scripts/Makefile.am2
-rw-r--r--Build/source/texk/texlive/tl_scripts/Makefile.in2
3 files changed, 6 insertions, 2 deletions
diff --git a/Build/source/texk/texlive/tl_scripts/ChangeLog b/Build/source/texk/texlive/tl_scripts/ChangeLog
index f61d5d09a64..5f5a8561b59 100644
--- a/Build/source/texk/texlive/tl_scripts/ChangeLog
+++ b/Build/source/texk/texlive/tl_scripts/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-28 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Simplify '$(srcdir)/..'=> '$(top_srcdir)'.
+
2013-04-14 Karl Berry <karl@tug.org>
* updmap.pl: wording, sync from Master.
diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.am b/Build/source/texk/texlive/tl_scripts/Makefile.am
index 9942ede0c58..0bd604c140e 100644
--- a/Build/source/texk/texlive/tl_scripts/Makefile.am
+++ b/Build/source/texk/texlive/tl_scripts/Makefile.am
@@ -105,7 +105,7 @@ dist_web2c_DATA = fmtutil.cnf
## we don't want to require help2man for an install. Leave that to be
## done by hand.
.PHONY: xupdmap.1
-updmap_dir = $(srcdir)/../linked_scripts/texlive
+updmap_dir = $(top_srcdir)/linked_scripts/texlive
xupdmap.1: updmap.help2man $(updmap_dir)/updmap.pl
help2man --include=$< --source="TeX Live" --no-info \
$(updmap_dir)/updmap.pl >/tmp/$@
diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.in b/Build/source/texk/texlive/tl_scripts/Makefile.in
index 62a0b47a7de..4bf87a94c8b 100644
--- a/Build/source/texk/texlive/tl_scripts/Makefile.in
+++ b/Build/source/texk/texlive/tl_scripts/Makefile.in
@@ -284,7 +284,7 @@ dist_texconfig_SCRIPTS = tcfmgr
dist_texconfig_DATA = tcfmgr.map
web2cdir = $(datarootdir)/texmf-dist/web2c
dist_web2c_DATA = fmtutil.cnf
-updmap_dir = $(srcdir)/../linked_scripts/texlive
+updmap_dir = $(top_srcdir)/linked_scripts/texlive
run_texlinks = $(DESTDIR)$(bindir)/texlinks -v \
-f $(DESTDIR)$(web2cdir)/fmtutil.cnf \
-e "$(EXEEXT)" $(DESTDIR)$(bindir)