More recent autotools update fixes, remove old

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

7 files changed, 227 insertions, 153 deletions

diff --git a/sci-visualization/epix/ChangeLog b/sci-visualization/epix/ChangeLog
index 967c85644d33..a12b73f60655 100644
--- a/sci-visualization/epix/ChangeLog
+++ b/sci-visualization/epix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-visualization/epix
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/ChangeLog,v 1.39 2012/01/30 02:26:59 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/ChangeLog,v 1.40 2012/02/19 17:04:33 bicatali Exp $
+
+  19 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/epix-1.2.7-doc-gentoo.patch, -epix-1.2.8.ebuild, epix-1.2.9.ebuild,
+  -files/epix-1.2.9-automake.patch, +files/epix-1.2.9-autotools.patch:
+  More recent autotools update fixes, remove old
 
   30 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org> epix-1.2.9.ebuild,
   +files/epix-1.2.9-automake.patch:
diff --git a/sci-visualization/epix/Manifest b/sci-visualization/epix/Manifest
index 878e731eb72d..9250b85618a2 100644
--- a/sci-visualization/epix/Manifest
+++ b/sci-visualization/epix/Manifest
@@ -3,20 +3,17 @@ Hash: SHA1
 
 AUX 50epix-gentoo.el 298 RMD160 cf3db606d04a04c8695828c9b870df5dc425d75e SHA1 aee1c361f181625fcf34bf12fc2a8d54b8595b24 SHA256 5aa1fc2e45f9c544f4cfc95a803a2540a42ef766258eecbb3d166b158565d219
 AUX epix-1.2.6-doc-gentoo.patch 2613 RMD160 51814fc3ed8fc00cdb097f2090c4cf6168408b1a SHA1 4efd409d05342e2d6ec425c1883d566f2b070b12 SHA256 f0368e0a08e26051070816f24503b01b1eada43ec8e5b022643b144998f51513
-AUX epix-1.2.7-doc-gentoo.patch 2080 RMD160 0386998057f1e48ae87a7f71f329331594d34b51 SHA1 ebc901bef5d48cf245dd569c579564717bbf94d8 SHA256 1c378083d1bbedb9a27ea7d2b94c04b4a4cdb0c3e3c9b2e02b72fcf1f6a2ad02
-AUX epix-1.2.9-automake.patch 373 RMD160 d50bdd89ac91f7e71f0ff6cd3f178feb6e7f6fc0 SHA1 2cb6e603b9f1ae137e03f48ff07ac020a5aaf4b9 SHA256 8b176fe6fa54c82462ee7c720543c22ef12598bbbf99e5c165b8c896895004c9
+AUX epix-1.2.9-autotools.patch 7204 RMD160 96398d7f9c2ec90bc9e97a2fa476439e7fe1447b SHA1 9206d712242ceb986535ec2dc0e1ca157522d6b0 SHA256 b86483b07f00264dafa7c7703045b17bdac4a0f84222725e278616c6966967b3
 DIST epix-1.2.6_withpdf.tar.bz2 1736850 RMD160 6d47689f42ed4631338bee8b27d00fede8eb97e3 SHA1 c88b256fbcb40c1a94cc979c67eee930a6e24ed0 SHA256 9c377bcf8556bd91f46322e618a8e2d607ebc64e41b2cc57483aa87f414490db
-DIST epix-1.2.8_withpdf.tar.bz2 1699834 RMD160 2dfc5c2d41f720449f1bdf031a96468af3463ff6 SHA1 4a3ea064f20b9529cb7f259e57e4083c0c689edb SHA256 1dfd0ea9fd379ad72140558e64e93c065e592216f061f25cf508df10ab175e22
 DIST epix-1.2.9_withpdf.tar.bz2 1701229 RMD160 d031eae4d2f757ed1bb5a1ae57322a0808b7a35d SHA1 1c42e0131fdde99c6bf60881bf09f20c69910877 SHA256 c8735b6f4a5732586d2ec25268ba98186ef00638943642dfcb40cae4f7887653
 EBUILD epix-1.2.6.ebuild 1716 RMD160 7e1425040dcc1710bab7828551ec28c2cb1543c8 SHA1 22c3b7f05f170bd3148d13a1235855a17ba4e9c4 SHA256 9234c750128cb682fe5f557a3910811e1fed6f28eecfeabc1ae212183682ea4c
-EBUILD epix-1.2.8.ebuild 1631 RMD160 bb4400d1b8a0abe00e5ed35ccf2d136126494d64 SHA1 aade05ef964e0b57e73511d16f04d65310454c76 SHA256 c849b6d9c977baa9c338a0263aef586a86db2b3b8a3215635573bf0eab0753e0
-EBUILD epix-1.2.9.ebuild 1672 RMD160 da5836572257e7f4edaf91770dbdce205b30cc79 SHA1 22a75b5c1613191c0bcd9a3fd4c58d08180c92e6 SHA256 bba2ac5b44f749f74f95654a5c4c2556376ebb30440c84d0e4288976305705ec
-MISC ChangeLog 7760 RMD160 643325fef0fd563073650112d3fa408c083159c0 SHA1 fb3535c3bcc8f341b135639a90bf83fe1ede7eda SHA256 9f2341b7feec4ebabecacefab544a83b45e7bf67d8a49bb1cba1fef4b77a6f6a
+EBUILD epix-1.2.9.ebuild 1573 RMD160 8171d6d53aa93dbb4a60ddbe79667afbd3259a55 SHA1 8fdc024c1c68e6a0a924aceeeeb8e4389888c139 SHA256 02a9b2f66f0c674a42681d11c920157792ffc57e7cc9230d94f7ad2f76a5774d
+MISC ChangeLog 8013 RMD160 c2613c5511c366de0305de8b34ed21d51b479bde SHA1 34f44a411ef09a00861014568c945ee5d63c06af SHA256 c300adcd13406a4443e8b8057c2b5a558105ee53366243bdd6247f67b3d7b048
 MISC metadata.xml 674 RMD160 b9ef5d9bd4c2a378d20e8b2abf7e49aa009d2404 SHA1 0bbed1bb0008d1dd7710b029ca04a743a0caa1e5 SHA256 ddb3fcaa3745e042ed7ef3e79faf17ce4d6264ff48261c0e2a5466964908edae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8mAAAACgkQ1ycZbhPLE2D5FgCfXjLZFP6GI2QrfTp8eTrSFd6d
-XLYAoJqocUP43HzlUnMpzl+LKWoi5EqH
-=MgpS
+iEYEARECAAYFAk9BK6kACgkQ1ycZbhPLE2BtAQCfRXUToDgmkz2JHqiEC7XmqQI3
+UmgAnj7406cDQv30NeTQ99sg3NvE+Nh9
+=oofp
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/epix/epix-1.2.8.ebuild b/sci-visualization/epix/epix-1.2.8.ebuild
deleted file mode 100644
index 74778c4a4e95..000000000000
--- a/sci-visualization/epix/epix-1.2.8.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/epix-1.2.8.ebuild,v 1.3 2011/10/05 18:41:37 aballier Exp $
-
-EAPI=4
-inherit elisp-common bash-completion autotools
-
-DESCRIPTION="2- and 3-D plotter for creating images (to be used in LaTeX)"
-HOMEPAGE="http://mathcs.holycross.edu/~ahwang/current/ePiX.html"
-SRC_URI="http://mathcs.holycross.edu/~ahwang/epix/${P}_withpdf.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc emacs examples"
-
-DEPEND="virtual/latex-base
-		dev-texlive/texlive-pstricks
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-latexextra
-		dev-tex/xcolor
-		emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	# disable automatic install of doc and examples
-	epatch "${FILESDIR}"/${PN}-1.2.7-doc-gentoo.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--disable-epix-el
-}
-
-src_install() {
-	default
-	if use emacs; then
-		# do compilation here as the make install target will
-		# create the .el file
-		elisp-compile *.el || die "elisp-compile failed!"
-		elisp-install ${PN} *.elc *.el || die "elisp-install failed!"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-	dobashcompletion bash_completions
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins doc/*gz
-	fi
-	if use examples; then
-		cd samples
-		insinto /usr/share/doc/${PF}/examples
-		doins *.xp *.flx *c *h README
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-visualization/epix/epix-1.2.9.ebuild b/sci-visualization/epix/epix-1.2.9.ebuild
index 1979ba7d01dd..f8843633c0ce 100644
--- a/sci-visualization/epix/epix-1.2.9.ebuild
+++ b/sci-visualization/epix/epix-1.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/epix-1.2.9.ebuild,v 1.2 2012/01/30 02:26:59 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/epix-1.2.9.ebuild,v 1.3 2012/02/19 17:04:33 bicatali Exp $
 
 EAPI=4
 inherit elisp-common bash-completion-r1 autotools
@@ -24,9 +24,7 @@ RDEPEND="${DEPEND}"
 SITEFILE=50${PN}-gentoo.el
 
 src_prepare() {
-	# disable automatic install of doc and examples
-	epatch "${FILESDIR}"/${PN}-1.2.7-doc-gentoo.patch
-	epatch "${FILESDIR}"/${PN}-1.2.9-automake.patch
+	epatch "${FILESDIR}"/${PN}-1.2.9-autotools.patch
 	eautoreconf
 }
 
diff --git a/sci-visualization/epix/files/epix-1.2.7-doc-gentoo.patch b/sci-visualization/epix/files/epix-1.2.7-doc-gentoo.patch
deleted file mode 100644
index 676fbb44977f..000000000000
--- a/sci-visualization/epix/files/epix-1.2.7-doc-gentoo.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Nur epix-1.2.7.orig/doc/Makefile.am epix-1.2.7/doc/Makefile.am
---- epix-1.2.7.orig/doc/Makefile.am	2010-05-05 00:12:18.000000000 +0100
-+++ epix-1.2.7/doc/Makefile.am	2010-05-05 00:15:05.000000000 +0100
-@@ -1,7 +1,7 @@
- # Makefile.am for ePiX v1.x "doc" directory
- #
- 
--EPIXFLAGS = --no-defaults -I.. -L.. -lepix -v
-+EPIXFLAGS = --no-defaults -I.. -L.. -lepix -q
- 
- %.eepic: %.xp
- 	../epix-local $(EPIXFLAGS) $<
-@@ -13,13 +13,13 @@
- CLEANFILES = *~ *.aux *.dvi *.log *.out *.toc \
- 	*.fdx *.flg *.fnd *.idx *.ilg *.ind \
- 	epix.info epix.info.bz2 manual_src.tar manual.pdf manual.ps \
--	manual_src.tar.gz manual.pdf.gz manual.ps.gz manual-stamp
-+	manual_src.tar.gz manual.pdf manual.ps.gz manual-stamp
- 
- MAINTAINERCLEANFILES = *.eepic *.aux *.dvi *.log *.out *.toc \
- 	*.fdx *.flg *.fnd *.idx *.ilg *.ind
- 
- ## Targets ##
--doc_DATA = manual.pdf.gz manual.ps.gz manual_src.tar.gz
-+doc_DATA = 
- 
- info_TEXINFOS = epix.texi
- 
-@@ -42,8 +42,7 @@
- 	gzip -9 -c manual.ps > manual.ps.gz
- 
- #PDF
--manual.pdf.gz: manual-stamp
--	gzip -9 -c manual.pdf > manual.pdf.gz
-+manual.pdf: manual-stamp
- 
- epix.info: manual-stamp epix.texi
- 	makeinfo epix.texi 2>&1 >/dev/null
-diff -Nur epix-1.2.7.orig/Makefile.am epix-1.2.7/Makefile.am
---- epix-1.2.7.orig/Makefile.am	2010-05-05 00:12:18.000000000 +0100
-+++ epix-1.2.7/Makefile.am	2010-05-05 00:15:48.000000000 +0100
-@@ -56,7 +56,7 @@
- 
- EPIX_CONFFILES = bash_completions $(EPIX_EL)
- 
--EPIX_NOTEFILES = AUTHORS BUGS ChangeLog COPYING INSTALL NEWS POST-INSTALL \
-+EPIX_NOTEFILES = AUTHORS BUGS ChangeLog NEWS POST-INSTALL \
- 	README THANKS VERSION
- 
- EXTRA_DIST = $(bin_SCRIPTS) $(man_MANS) $(EPIX_CONFFILES) $(EPIX_NOTEFILES) \
-diff -Nur epix-1.2.7.orig/samples/Makefile.am epix-1.2.7/samples/Makefile.am
---- epix-1.2.7.orig/samples/Makefile.am	2010-05-05 00:12:18.000000000 +0100
-+++ epix-1.2.7/samples/Makefile.am	2010-05-05 00:16:39.000000000 +0100
-@@ -7,7 +7,7 @@
- CLEANFILES = *~ *.eepic *.eps sample_src.tar sample_src.tar.gz sample-stamp
- 
- ## Targets ##
--doc_DATA = sample_src.tar.gz
-+doc_DATA =
- 
- 
- # tar up tex, xp, and eepic files
diff --git a/sci-visualization/epix/files/epix-1.2.9-automake.patch b/sci-visualization/epix/files/epix-1.2.9-automake.patch
deleted file mode 100644
index 11233b0102dd..000000000000
--- a/sci-visualization/epix/files/epix-1.2.9-automake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.am.orig	2012-01-30 02:24:22.000000000 +0000
-+++ Makefile.am	2012-01-30 02:24:58.000000000 +0000
-@@ -15,7 +15,8 @@
- bin_SCRIPTS = epix elaps flix laps
- 
- pkglib_LIBRARIES = libepix.a
--pkglib_DATA = epix-lib.sh
-+pkgepixdir = $(pkglibdir)
-+pkgepix_DATA = epix-lib.sh
- include_HEADERS = epix.h
- 
- libepix_a_CXXSOURCES = active_screen.cc affine.cc angle_units.cc \
diff --git a/sci-visualization/epix/files/epix-1.2.9-autotools.patch b/sci-visualization/epix/files/epix-1.2.9-autotools.patch
new file mode 100644
index 000000000000..05b40d2810f1
--- /dev/null
+++ b/sci-visualization/epix/files/epix-1.2.9-autotools.patch
@@ -0,0 +1,213 @@
+* disable automatic install of doc and examples
+* update for newer autotools
+Patch by Sebastien Fabbro
+
+diff -Nur epix-1.2.9.orig/doc/Makefile.am epix-1.2.9/doc/Makefile.am
+--- epix-1.2.9.orig/doc/Makefile.am	2009-02-16 02:16:58.000000000 +0000
++++ epix-1.2.9/doc/Makefile.am	2012-02-19 16:46:02.123782104 +0000
+@@ -1,7 +1,7 @@
+ # Makefile.am for ePiX v1.x "doc" directory
+ #
+ 
+-EPIXFLAGS = --no-defaults -I.. -L.. -lepix -v
++EPIXFLAGS = --no-defaults -I.. -L.. -lepix -q
+ 
+ %.eepic: %.xp
+ 	../epix-local $(EPIXFLAGS) $<
+@@ -13,13 +13,13 @@
+ CLEANFILES = *~ *.aux *.dvi *.log *.out *.toc \
+ 	*.fdx *.flg *.fnd *.idx *.ilg *.ind \
+ 	epix.info epix.info.bz2 manual_src.tar manual.pdf manual.ps \
+-	manual_src.tar.gz manual.pdf.gz manual.ps.gz manual-stamp
++	manual_src.tar.gz manual.pdf manual.ps.gz manual-stamp
+ 
+ MAINTAINERCLEANFILES = *.eepic *.aux *.dvi *.log *.out *.toc \
+ 	*.fdx *.flg *.fnd *.idx *.ilg *.ind
+ 
+ ## Targets ##
+-doc_DATA = manual.pdf.gz manual.ps.gz manual_src.tar.gz
++doc_DATA = 
+ 
+ info_TEXINFOS = epix.texi
+ 
+@@ -42,8 +42,7 @@
+ 	gzip -9 -c manual.ps > manual.ps.gz
+ 
+ #PDF
+-manual.pdf.gz: manual-stamp
+-	gzip -9 -c manual.pdf > manual.pdf.gz
++manual.pdf: manual-stamp
+ 
+ epix.info: manual-stamp epix.texi
+ 	makeinfo epix.texi 2>&1 >/dev/null
+diff -Nur epix-1.2.9.orig/Makefile.am epix-1.2.9/Makefile.am
+--- epix-1.2.9.orig/Makefile.am	2010-01-25 02:42:26.000000000 +0000
++++ epix-1.2.9/Makefile.am	2012-02-19 16:50:24.890671835 +0000
+@@ -15,7 +15,8 @@
+ bin_SCRIPTS = epix elaps flix laps
+ 
+ pkglib_LIBRARIES = libepix.a
+-pkglib_DATA = epix-lib.sh
++pkgepixdir = $(pkglibdir)
++pkgepix_DATA = epix-lib.sh
+ include_HEADERS = epix.h
+ 
+ libepix_a_CXXSOURCES = active_screen.cc affine.cc angle_units.cc \
+@@ -56,7 +57,7 @@
+ 
+ EPIX_CONFFILES = bash_completions $(EPIX_EL)
+ 
+-EPIX_NOTEFILES = AUTHORS BUGS ChangeLog COPYING INSTALL NEWS POST-INSTALL \
++EPIX_NOTEFILES = AUTHORS BUGS ChangeLog NEWS POST-INSTALL \
+ 	README THANKS VERSION
+ 
+ EXTRA_DIST = $(bin_SCRIPTS) $(man_MANS) $(EPIX_CONFFILES) $(EPIX_NOTEFILES) \
+@@ -102,13 +103,12 @@
+ # Extra things to install
+ install-data-local:
+ 	@echo; echo "Installing notes and configuration files"
+-	$(mkinstalldirs) $(DESTDIR)$(docdir)/notes $(DESTDIR)$(docdir)/config
+-	$(INSTALL_DATA) $(EPIX_NOTEFILES) $(DESTDIR)$(docdir)/notes
+-	$(INSTALL_DATA) $(EPIX_CONFFILES) $(DESTDIR)$(docdir)/config
++	$(mkinstalldirs) $(DESTDIR)$(docdir)
++	$(INSTALL_DATA) $(EPIX_NOTEFILES) $(DESTDIR)$(docdir)
+ 
+ # This is being installed by install-exec, but should not be executable
+-install-exec-local: install-pkglibDATA
+-	chmod a-x $(DESTDIR)$(pkglibdir)/epix-lib.sh
++install-exec-local: install-pkgepixDATA
++	chmod a-x $(DESTDIR)$(pkgepixdir)/epix-lib.sh
+ 
+ uninstall-local:
+ 	-rm -rf $(DESTDIR)$(docdir)/notes $(DESTDIR)$(docdir)/config
+diff -Nur epix-1.2.9.orig/Makefile.am~ epix-1.2.9/Makefile.am~
+--- epix-1.2.9.orig/Makefile.am~	1970-01-01 01:00:00.000000000 +0100
++++ epix-1.2.9/Makefile.am~	2012-02-19 16:46:02.000000000 +0000
+@@ -0,0 +1,115 @@
++## epix-1.x Makefile.am for top-level directory
++##
++## Process this file with automake to produce Makefile.in
++
++#if BUILD_CONTRIB
++  # Must be in this order!
++#  MAYBE_DIRS = contrib contrib/doc
++#endif
++
++# SUBDIRS = . samples doc $(MAYBE_DIRS)
++SUBDIRS = . samples doc
++
++# Now stuff for this directory specifically
++
++bin_SCRIPTS = epix elaps flix laps
++
++pkglib_LIBRARIES = libepix.a
++pkglib_DATA = epix-lib.sh
++include_HEADERS = epix.h
++
++libepix_a_CXXSOURCES = active_screen.cc affine.cc angle_units.cc \
++	arrow_data.cc arrow_style.cc axis.cc camera.cc circle.cc clipping.cc \
++	Color_Base.cc Color.cc Color_CMY.cc Color_CMYK.cc Color_Gray.cc \
++	Color_Neutral.cc Color_RGB.cc Color_Sep.cc Color_Utils.cc \
++	cropping.cc curves.cc \
++	data_bins.cc data_file.cc data_mask.cc domain.cc \
++	eepic.cc facet.cc format.cc frac.cc frame.cc functions.cc \
++	geometry.cc glyph.cc halfspace.cc hatching.cc \
++	intersections.cc interval.cc label_data.cc label_style.cc \
++	legend.cc legend_item.cc legend_tile.cc \
++	length.cc lens.cc markers.cc marker_style.cc \
++	mask_diamond.cc mask_ellipse.cc mask_rectangle.cc \
++	paint_style.cc pairs.cc path.cc path_data.cc \
++	path_style.cc pen_arrow.cc pen_data.cc pen_fill.cc pen_line.cc \
++	picture.cc picture_data.cc plane.cc plots.cc pst.cc \
++	screen.cc screen_crop.cc screen_data.cc screen_mask.cc \
++	segment.cc spline.cc sphere.cc state.cc surface.cc tikz.cc tile.cc \
++	triples.cc utils.cc verbatim.cc
++#	polygon.cc 
++
++libepix_a_HDRS = $(libepix_a_CXXSOURCES:.cc=.h) constants.h \
++	crop_algorithms.h deriv.h edge_data.h enums.h errors.h \
++	map.h plot_algorithms.h spline_data.h
++
++libepix_a_SOURCES = $(libepix_a_CXXSOURCES) $(libepix_a_HDRS)
++
++libepix_a_LIBADD = $(libepix_a_CXXSOURCES:.cc=.o)
++
++pkginclude_HEADERS = $(libepix_a_HDRS)
++
++man_MANS = epix.1 elaps.1 flix.1 laps.1
++
++if ENABLE_EPIX_EL
++  EPIX_EL = epix.el
++endif
++
++EPIX_CONFFILES = bash_completions $(EPIX_EL)
++
++EPIX_NOTEFILES = AUTHORS BUGS ChangeLog NEWS POST-INSTALL \
++	README THANKS VERSION
++
++EXTRA_DIST = $(bin_SCRIPTS) $(man_MANS) $(EPIX_CONFFILES) $(EPIX_NOTEFILES) \
++	$(pkgdata_DATA)
++
++CLEANFILES = *~ $(libepix_a_OBJECTS) $(bin_SCRIPTS) $(bin_SCRIPTS:=-local) \
++	epix.h epix.1 epix.el
++
++# Headers
++epix.h: $(libepix_a_HDRS)
++	./make_header
++
++# Scripts; we create local variants which will work during the build process
++epix elaps flix laps: %: %.in epix.el
++	sed -e 's%^#! /bin/bash%#! $(BASH_PATH)%;' \
++	    -e 's%@bindir\@%$(bindir)%;' \
++	    -e 's%@pkglibdir\@%$(pkglibdir)%;' \
++	    -e 's%@includedir\@%$(includedir)%;' \
++	    -e 's%@RUNTIME_COMPILER\@%$(RUNTIME_COMPILER)%;' $< > $@
++	sed -e 's%^#! /bin/bash%#! $(BASH_PATH)%;' \
++	    -e 's%@bindir\@%$(CURDIR)%;' \
++	    -e 's%@pkglibdir\@%$(CURDIR)%;' \
++	    -e 's%@includedir\@%$(CURDIR)%;' \
++	    -e 's%@RUNTIME_COMPILER\@%$(CXX)%;' $< > $@-local
++	chmod a+x $@ $@-local
++
++# libepix.a
++libepix.a: $(libepix_a_OBJECTS)
++	ar -ru libepix.a $(libepix_a_OBJECTS)
++	$(RANLIB) libepix.a
++
++# object file dependencies
++$(libepix_a_LIBADD): %.o: %.cc %.h
++
++# Manpage
++epix.1: epix.1.in
++	sed -e 's%@docdir\@%$(docdir)%;' $< > $@
++
++#  emacs mode
++epix.el: epix.el.in
++	sed -e 's%@infodir\@%$(infodir)%;' $< > $@
++
++# Extra things to install
++install-data-local:
++	@echo; echo "Installing notes and configuration files"
++	$(mkinstalldirs) $(DESTDIR)$(docdir)/notes $(DESTDIR)$(docdir)/config
++	$(INSTALL_DATA) $(EPIX_NOTEFILES) $(DESTDIR)$(docdir)/notes
++	$(INSTALL_DATA) $(EPIX_CONFFILES) $(DESTDIR)$(docdir)/config
++
++# This is being installed by install-exec, but should not be executable
++install-exec-local: install-pkglibDATA
++	chmod a-x $(DESTDIR)$(pkglibdir)/epix-lib.sh
++
++uninstall-local:
++	-rm -rf $(DESTDIR)$(docdir)/notes $(DESTDIR)$(docdir)/config
++	-rmdir $(DESTDIR)$(docdir)
+diff -Nur epix-1.2.9.orig/samples/Makefile.am epix-1.2.9/samples/Makefile.am
+--- epix-1.2.9.orig/samples/Makefile.am	2008-07-01 03:55:14.000000000 +0100
++++ epix-1.2.9/samples/Makefile.am	2012-02-19 16:46:02.123782104 +0000
+@@ -7,7 +7,7 @@
+ CLEANFILES = *~ *.eepic *.eps sample_src.tar sample_src.tar.gz sample-stamp
+ 
+ ## Targets ##
+-doc_DATA = sample_src.tar.gz
++doc_DATA =
+ 
+ 
+ # tar up tex, xp, and eepic files