Andreas Schwab
f46b64c63b
- Remove upsteamed patch: * autoopts-remove-stupid-set-e.patch * agen5-testsuite.patch - Cleanup spec file with spec-cleaner - Use url for source - Add gpg signature - Update to 5.18.4 OBS-URL: https://build.opensuse.org/request/show/288512 OBS-URL: https://build.opensuse.org/package/show/Base:System/autogen?expand=0&rev=31
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
---
|
|
autoopts/Makefile.am | 2 +-
|
|
doc/mk-agen-texi.sh | 6 +++---
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
Index: autoopts/Makefile.am
|
|
===================================================================
|
|
--- autoopts/Makefile.am.orig
|
|
+++ autoopts/Makefile.am
|
|
@@ -164,7 +164,7 @@ INST_SH = autoopts-con
|
|
|
|
man_MANS = $(INST_MANS)
|
|
m4data_DATA = autoopts.m4
|
|
-nobase_data_DATA = $(INST_PKGCFG)
|
|
+pkgconfig_DATA = $(INST_PKGCFG)
|
|
lib_LTLIBRARIES = $(INST_LIBS)
|
|
nobase_include_HEADERS = $(INST_HDRS)
|
|
bin_SCRIPTS = $(INST_SH)
|
|
Index: doc/mk-agen-texi.sh
|
|
===================================================================
|
|
--- doc/mk-agen-texi.sh.orig
|
|
+++ doc/mk-agen-texi.sh
|
|
@@ -93,9 +93,9 @@ setup_exports()
|
|
|
|
PATH=${top_builddir}/columns:${PATH}
|
|
timer=`expr ${AG_TIMEOUT} '*' 5`
|
|
- d=`find ${top_builddir}/autoopts -type f -name libopts.a -print`
|
|
- test -f "$d" || die "Cannot locate libopts.a"
|
|
- LIBS="$d ${LIBS}"
|
|
+ d=`find ${top_builddir}/autoopts -type f -name libopts.a -o -name libopts.so | head -n 1`
|
|
+ LIBS="-L$(dirname "$d") -lopts ${LIBS}"
|
|
+ LD_LIBRARY_PATH="$(dirname "$d"):$LD_LIBRARY_PATH"
|
|
|
|
eval `${EGREP} '^AG_[A-Z_]*' ${top_srcdir}/VERSION`
|
|
|