74 lines
2.4 KiB
Diff
74 lines
2.4 KiB
Diff
|
From: Egbert Eich <eich@suse.com>
|
||
|
|
Date: Sun Jan 28 01:13:37 2018 +0100
|
||
|
|
Subject: Remove all remains of EXTENSION_DESTDIR
|
||
|
|
Patch-mainline: Not yet
|
||
|
|
Git-commit: eb4fc9e5e149db4e1c8c879ab42eaee3f1685cc7
|
||
|
|
References:
|
||
|
|
|
||
|
|
Now as we use DESTDIR as specified with 'make install', remove
|
||
|
|
any autoconf and spec file bits of EXTENSION_DESTDIR.
|
||
|
|
|
||
|
|
Signed-off-by: Egbert Eich <eich@suse.com>
|
||
|
|
---
|
||
|
|
config/ac_extension_destdir.m4 | 27 ---------------------------
|
||
|
|
genders.spec | 1 -
|
||
|
|
genders.spec.in | 1 -
|
||
|
|
3 files changed, 29 deletions(-)
|
||
|
|
diff --git a/config/ac_extension_destdir.m4 b/config/ac_extension_destdir.m4
|
||
|
|
deleted file mode 100644
|
||
|
|
index 3c5a33c..0000000
|
||
|
|
--- a/config/ac_extension_destdir.m4
|
||
|
|
+++ /dev/null
|
||
|
|
@@ -1,27 +0,0 @@
|
||
|
|
-##*****************************************************************************
|
||
|
|
-## $Id: ac_destdir_destdir.m4,v 1.1 2006-07-17 22:06:43 chu11 Exp $
|
||
|
|
-##*****************************************************************************
|
||
|
|
-
|
||
|
|
-# Used almost exclusively so extensions like perl and python install works
|
||
|
|
-# with rpm builds
|
||
|
|
-AC_DEFUN([AC_EXTENSION_DESTDIR],
|
||
|
|
-[
|
||
|
|
- AC_MSG_CHECKING(for --with-extension-destdir )
|
||
|
|
- AC_ARG_WITH(extension-destdir,
|
||
|
|
- AC_HELP_STRING([--with-extension-destdir=path],
|
||
|
|
- [define extension modules install prefix]),
|
||
|
|
- [ case "$withval" in
|
||
|
|
- yes)
|
||
|
|
- withextensionldestdir=yes
|
||
|
|
- ;;
|
||
|
|
- no)
|
||
|
|
- ;;
|
||
|
|
- *)
|
||
|
|
- withextensionldestdir=yes
|
||
|
|
- EXTENSION_DESTDIR="$withval"
|
||
|
|
- ;;
|
||
|
|
- esac ]
|
||
|
|
- )
|
||
|
|
- AC_MSG_RESULT(${withextensionldestdir=no})
|
||
|
|
- AC_SUBST(EXTENSION_DESTDIR)
|
||
|
|
-])
|
||
|
|
diff --git a/genders.spec b/genders.spec
|
||
|
|
index 92d678f..9ad4b36 100644
|
||
|
|
--- a/genders.spec
|
||
|
|
+++ b/genders.spec
|
||
|
|
@@ -41,7 +41,6 @@ genders API that is compatible with earlier releases of genders
|
||
|
|
|
||
|
|
%build
|
||
|
|
%configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \
|
||
|
|
- --with-extension-destdir="$RPM_BUILD_ROOT" \
|
||
|
|
%{?_with_perl_extensions} \
|
||
|
|
%{?_without_perl_extensions} \
|
||
|
|
%{?_with_perl_site_arch} \
|
||
|
|
diff --git a/genders.spec.in b/genders.spec.in
|
||
|
|
index dba2ef0..10c3df4 100644
|
||
|
|
--- a/genders.spec.in
|
||
|
|
+++ b/genders.spec.in
|
||
|
|
@@ -41,7 +41,6 @@ genders API that is compatible with earlier releases of genders
|
||
|
|
|
||
|
|
%build
|
||
|
|
%configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \
|
||
|
|
- --with-extension-destdir="$RPM_BUILD_ROOT" \
|
||
|
|
%{?_with_perl_extensions} \
|
||
|
|
%{?_without_perl_extensions} \
|
||
|
|
%{?_with_perl_site_arch} \
|