mars_nwe/mars-flaim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweaked rpm build a bit.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@1100 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
jcalcote
2009-07-02 21:48:46 +00:00
parent dc459b88b4
commit 64edd982af
10 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@@ -6,7 +6,7 @@ SUBDIRS = ftk flaim sql xflaim
rpms srcrpm:
for dir in $(SUBDIRS); do \
cd $$dir && $(MAKE) $(AM_MAKEFLAGS) $@; \
(cd $$dir && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
done
dist-hook:

2
flaim/Makefile.am
View File

@@ -12,7 +12,7 @@ pkgconfig_DATA = libflaim.pc
RPM = rpm
rpms srcrpm: dist
cd obs && $(MAKE) $(AM_MAKEFLAGS) $@
(cd obs && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1
rpmarch=`$(RPM) --showrc | grep "^build arch" | sed 's/\(.*: \)\(.*\)/\2/'`; \
test -z "$$rpmarch" || ( mv $$rpmarch/* .; rm -rf $$rpmarch )
rm -rf $(distdir)

10
flaim/obs/Makefile.am
View File

@@ -1,11 +1,11 @@
rpmspec = $(PACKAGE_TARNAME).spec
rpmmacros =\
--define='_rpmdir $(PWD)'\
--define='_srcrpmdir $(PWD)'\
--define='_sourcedir $(PWD)'\
--define='_specdir $(PWD)'\
--define='_builddir $(PWD)'
--define='_rpmdir $(PWD)/..'\
--define='_srcrpmdir $(PWD)/..'\
--define='_sourcedir $(PWD)/..'\
--define='_specdir $(PWD)/..'\
--define='_builddir $(PWD)/..'
rpmopts = --nodeps --buildroot='$(PWD)/_rpm'

2
ftk/Makefile.am
View File

@@ -16,7 +16,7 @@ pkgconfig_DATA = libflaimtk.pc
RPM = rpm
rpms srcrpm: dist
cd obs && $(MAKE) $(AM_MAKEFLAGS) $@
(cd obs && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1
rpmarch=`$(RPM) --showrc | grep "^build arch" | sed 's/\(.*: \)\(.*\)/\2/'`; \
test -z "$$rpmarch" || ( mv $$rpmarch/* .; rm -rf $$rpmarch )
rm -rf $(distdir)

9
ftk/libflaimtk.pc.in Normal file
View File

@@ -0,0 +1,9 @@
libdir=@libdir@
includedir=@includedir@
Name: FLAIM-Toolkit
URL: http://forge.novell.com/modules/xfmod/project/?flaim
Description: FLAIM system abstraction layer
Version: @PACKAGE_VERSION@
Libs: -lpthread -lrt -lstdc++ -ldl -lncurses -L${libdir} -lflaimtk
Cflags: -I${includedir}

10
ftk/obs/Makefile.am
View File

@@ -1,11 +1,11 @@
rpmspec = $(PACKAGE_TARNAME).spec
rpmmacros =\
--define='_rpmdir $(PWD)'\
--define='_srcrpmdir $(PWD)'\
--define='_sourcedir $(PWD)'\
--define='_specdir $(PWD)'\
--define='_builddir $(PWD)'
--define='_rpmdir $(PWD)/..'\
--define='_srcrpmdir $(PWD)/..'\
--define='_sourcedir $(PWD)/..'\
--define='_specdir $(PWD)/..'\
--define='_builddir $(PWD)/..'
rpmopts = --nodeps --buildroot='$(PWD)/_rpm'

2
sql/Makefile.am
View File

@@ -12,7 +12,7 @@ pkgconfig_DATA = libflaimsql.pc
RPM = rpm
rpms srcrpm: dist
cd obj && $(MAKE) $(AM_MAKEFLAGS) $@
(cd obj && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1
rpmarch=`$(RPM) --showrc | grep "^build arch" | sed 's/\(.*: \)\(.*\)/\2/'`; \
test -z "$$rpmarch" || ( mv $$rpmarch/* .; rm -rf $$rpmarch )
rm -rf $(distdir)

10
sql/obs/Makefile.am
View File

@@ -1,11 +1,11 @@
rpmspec = $(PACKAGE_TARNAME).spec
rpmmacros =\
--define='_rpmdir $(PWD)'\
--define='_srcrpmdir $(PWD)'\
--define='_sourcedir $(PWD)'\
--define='_specdir $(PWD)'\
--define='_builddir $(PWD)'
--define='_rpmdir $(PWD)/..'\
--define='_srcrpmdir $(PWD)/..'\
--define='_sourcedir $(PWD)/..'\
--define='_specdir $(PWD)/..'\
--define='_builddir $(PWD)/..'
rpmopts = --nodeps --buildroot='$(PWD)/_rpm'

2
xflaim/Makefile.am
View File

@@ -12,7 +12,7 @@ pkgconfig_DATA = libxflaim.pc
RPM = rpm
rpms srcrpm: dist
cd obs && $(MAKE) $(AM_MAKEFLAGS) $@
(cd obs && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1
rpmarch=`$(RPM) --showrc | grep "^build arch" | sed 's/\(.*: \)\(.*\)/\2/'`; \
test -z "$$rpmarch" || ( mv $$rpmarch/* .; rm -rf $$rpmarch )
rm -rf $(distdir)

10
xflaim/obs/Makefile.am
View File

@@ -1,11 +1,11 @@
rpmspec = $(PACKAGE_TARNAME).spec
rpmmacros =\
--define='_rpmdir $(PWD)'\
--define='_srcrpmdir $(PWD)'\
--define='_sourcedir $(PWD)'\
--define='_specdir $(PWD)'\
--define='_builddir $(PWD)'
--define='_rpmdir $(PWD)/..'\
--define='_srcrpmdir $(PWD)/..'\
--define='_sourcedir $(PWD)/..'\
--define='_specdir $(PWD)/..'\
--define='_builddir $(PWD)/..'
rpmopts = --nodeps --buildroot='$(PWD)/_rpm'