libraries/mrw-cxx
1
0
Fork 0
Code Issues Releases Activity

build fixes for rpm

Browse Source
This commit is contained in:
Marc Wäckerlin
2015-07-28 14:18:41 +00:00
parent c80d8d5630
commit aecc84c95a
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ax_init_standard_project.m4
View File

@@ -164,7 +164,6 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
test -f makefile.in && cat >> makefile.in <<EOF test -f makefile.in && cat >> makefile.in <<EOF
#### Begin: Appended by $0 #### Begin: Appended by $0
EXTRA_DIST = bootstrap.sh EXTRA_DIST = bootstrap.sh
doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
clean-standard-project-targets: clean-standard-project-targets:
-rm -rf \${PACKAGE_NAME}-\${PACKAGE_VERSION} -rm -rf \${PACKAGE_NAME}-\${PACKAGE_VERSION}
-rm \${PACKAGE_TARNAME}-\${PACKAGE_VERSION}.tar.gz -rm \${PACKAGE_TARNAME}-\${PACKAGE_VERSION}.tar.gz

2
bootstrap.sh
View File

@@ -817,6 +817,8 @@ done
to makefile.am<<EOF to makefile.am<<EOF
${HEADER}SUBDIRS =${SUBDIRS} ${HEADER}SUBDIRS =${SUBDIRS}
doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
MAINTAINERCLEANFILES = makefile.in MAINTAINERCLEANFILES = makefile.in
EOF EOF
to --condition AX_USE_LIBTOOL src/${PACKAGE_NAME}.pc.in <<EOF to --condition AX_USE_LIBTOOL src/${PACKAGE_NAME}.pc.in <<EOF

4
makefile.am
View File

@@ -1,6 +1,6 @@
## @id $Id$ ## @id $Id$
# #
# This file has been added by bootstrap.sh on Tue, 28 July 2015 11:31:59 +0200 # This file has been added by bootstrap.sh on Tue, 28 July 2015 16:14:38 +0200
# Feel free to change it or even remove and rebuild it, up to your needs # Feel free to change it or even remove and rebuild it, up to your needs
# #
## 1 2 3 4 5 6 7 8 ## 1 2 3 4 5 6 7 8
@@ -8,4 +8,6 @@
SUBDIRS = src test doc examples SUBDIRS = src test doc examples
doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
MAINTAINERCLEANFILES = makefile.in MAINTAINERCLEANFILES = makefile.in

9
mrw-c++.spec.in
View File

@@ -34,8 +34,7 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
/usr/bin/* /usr/%_lib/lib@PACKAGE_NAME@.so.*
/usr/%_lib/@PACKAGE_NAME@.so.*
%doc %doc
/usr/share/doc/packages/@PACKAGE_NAME@/AUTHORS /usr/share/doc/packages/@PACKAGE_NAME@/AUTHORS
/usr/share/doc/packages/@PACKAGE_NAME@/COPYING /usr/share/doc/packages/@PACKAGE_NAME@/COPYING
@@ -56,10 +55,10 @@ This Package contains all files required for developement.
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
/usr/%_lib/@PACKAGE_NAME@.so /usr/%_lib/lib@PACKAGE_NAME@.so
/usr/%_lib/@PACKAGE_NAME@.a /usr/%_lib/lib@PACKAGE_NAME@.a
/usr/%_lib/pkgconfig /usr/%_lib/pkgconfig
/usr/%_lib/@PACKAGE_NAME@.la /usr/%_lib/lib@PACKAGE_NAME@.la
/usr/include/ /usr/include/
/usr/share/pkgconfig /usr/share/pkgconfig
%doc %doc