From 8ae0d6d474054c4e0153ce35d48e923a2c3a69cf Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Fri, 10 Apr 2015 15:14:19 +0000 Subject: [PATCH] fixed minor build problems --- codepot/DEBIAN/Makefile.am | 1 + codepot/DEBIAN/Makefile.in | 2 ++ codepot/Makefile.am | 1 + codepot/Makefile.in | 1 + codepot/pecl-svn/Makefile.am | 4 ++-- codepot/pecl-svn/Makefile.in | 4 ++-- 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/codepot/DEBIAN/Makefile.am b/codepot/DEBIAN/Makefile.am index aae8392a..2737cfaf 100644 --- a/codepot/DEBIAN/Makefile.am +++ b/codepot/DEBIAN/Makefile.am @@ -3,6 +3,7 @@ EXTRA_DIST = conffiles copyright changelog docdir=$(DOCDIR) doc_DATA = copyright changelog +# Specifying debdir to /DEBIAN conflicts with 'make distcheck' debdir=/DEBIAN deb_DATA = control conffiles deb_SCRIPTS = postinst postrm diff --git a/codepot/DEBIAN/Makefile.in b/codepot/DEBIAN/Makefile.in index 139b6245..e8a9c5a4 100644 --- a/codepot/DEBIAN/Makefile.in +++ b/codepot/DEBIAN/Makefile.in @@ -204,6 +204,8 @@ top_srcdir = @top_srcdir@ wwwdir = @wwwdir@ EXTRA_DIST = conffiles copyright changelog doc_DATA = copyright changelog + +# Specifying debdir to /DEBIAN conflicts with 'make distcheck' debdir = /DEBIAN deb_DATA = control conffiles deb_SCRIPTS = postinst postrm diff --git a/codepot/Makefile.am b/codepot/Makefile.am index 89cd4d38..f970bfa6 100644 --- a/codepot/Makefile.am +++ b/codepot/Makefile.am @@ -30,6 +30,7 @@ distclean-local: $(RM) -r autom4te.cache config.h.in~ "$(PACKAGE)-$(VERSION)" +# TODO: specify --with-phpextdir and --with-phpextinidir for the deb target deb: dist-gzip tar -zxvf "$(PACKAGE)-$(VERSION).tar.gz" cd "$(PACKAGE)-$(VERSION)"; ./configure \ diff --git a/codepot/Makefile.in b/codepot/Makefile.in index 32c60ed5..1690221c 100644 --- a/codepot/Makefile.in +++ b/codepot/Makefile.in @@ -762,6 +762,7 @@ uninstall-hook: distclean-local: $(RM) -r autom4te.cache config.h.in~ "$(PACKAGE)-$(VERSION)" +# TODO: specify --with-phpextdir and --with-phpextinidir for the deb target deb: dist-gzip tar -zxvf "$(PACKAGE)-$(VERSION).tar.gz" cd "$(PACKAGE)-$(VERSION)"; ./configure \ diff --git a/codepot/pecl-svn/Makefile.am b/codepot/pecl-svn/Makefile.am index db986d39..83875da8 100644 --- a/codepot/pecl-svn/Makefile.am +++ b/codepot/pecl-svn/Makefile.am @@ -1,4 +1,4 @@ -EXTRA_DIST = config.m4 svn.c php_svn.h svn.ini +EXTRA_DIST = config.m4 svn.c php_svn.h svn.ini README all-local: mkdir -p @abs_builddir@/pecl @@ -19,4 +19,4 @@ install-data-hook: $(INSTALL) -D @abs_srcdir@/svn.ini $(DESTDIR)@PHPEXTINIDIR@/svn.ini uninstall-hook: - -rm -f @PHPEXTDIR@/svn.so $(DESTDIR)@PHPEXTINIDIR@/svn.ini + -rm -f $(DESTDIR)@PHPEXTDIR@/svn.so $(DESTDIR)@PHPEXTINIDIR@/svn.ini diff --git a/codepot/pecl-svn/Makefile.in b/codepot/pecl-svn/Makefile.in index 05499356..6ce064d5 100644 --- a/codepot/pecl-svn/Makefile.in +++ b/codepot/pecl-svn/Makefile.in @@ -168,7 +168,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ wwwdir = @wwwdir@ -EXTRA_DIST = config.m4 svn.c php_svn.h svn.ini +EXTRA_DIST = config.m4 svn.c php_svn.h svn.ini README all: all-am .SUFFIXES: @@ -377,7 +377,7 @@ install-data-hook: $(INSTALL) -D @abs_srcdir@/svn.ini $(DESTDIR)@PHPEXTINIDIR@/svn.ini uninstall-hook: - -rm -f @PHPEXTDIR@/svn.so $(DESTDIR)@PHPEXTINIDIR@/svn.ini + -rm -f $(DESTDIR)@PHPEXTDIR@/svn.so $(DESTDIR)@PHPEXTINIDIR@/svn.ini # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded.