rpmbuild should work now; refs #2
This commit is contained in:
		@@ -264,7 +264,7 @@ AM_CONDITIONAL(MINGW32, test "$MINGW32" = "yes")
 | 
			
		||||
AM_CONDITIONAL(MAC, test "$MAC" = "yes")
 | 
			
		||||
 | 
			
		||||
# export macros
 | 
			
		||||
RPMBUILD=${BUILD_NUMBER}
 | 
			
		||||
RPMBUILD=${BUILD_NUMBER:-1}
 | 
			
		||||
AC_SUBST(RPMBUILD)
 | 
			
		||||
SRCDIR=${srcdir}
 | 
			
		||||
AC_SUBST(SRCDIR)
 | 
			
		||||
 
 | 
			
		||||
@@ -3,7 +3,9 @@
 | 
			
		||||
##       1         2         3         4         5         6         7         8
 | 
			
		||||
## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 | 
			
		||||
 | 
			
		||||
noinst_PROGRAMS = exceptionhandling smartpointer
 | 
			
		||||
exampledir = ${docdir}/examples
 | 
			
		||||
example_PROGRAMS = exceptionhandling smartpointer
 | 
			
		||||
example_DATA = ${smartpointer_SOURCES} ${exceptionhandling_SOURCES}
 | 
			
		||||
 | 
			
		||||
exceptionhandling_SOURCES = exceptionhandling.cxx
 | 
			
		||||
exceptionhandling_CPPFLAGS = -I${top_srcdir}/src
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										11
									
								
								makefile.am
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								makefile.am
									
									
									
									
									
								
							@@ -13,7 +13,7 @@
 | 
			
		||||
 | 
			
		||||
SUBDIRS = @SRC_DIR@ @TST_DIR@ @DOC_DIR@
 | 
			
		||||
 | 
			
		||||
nobase_include_HEADERS =
 | 
			
		||||
doc_DATA = AUTHORS COPYING ChangeLog NEWS README INSTALL
 | 
			
		||||
 | 
			
		||||
EXTRA_DIST = bootstrap.sh debian
 | 
			
		||||
 | 
			
		||||
@@ -37,9 +37,10 @@ RPMS = /usr/src/packages/RPMS/i586/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.i586.
 | 
			
		||||
release: tag webserver
 | 
			
		||||
 | 
			
		||||
rpm: dist
 | 
			
		||||
	cp @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.tar.gz \
 | 
			
		||||
	/usr/src/packages/SOURCES/
 | 
			
		||||
	rpmbuild -ba --clean @PACKAGENAME@.spec
 | 
			
		||||
	rpmbuild -ba \
 | 
			
		||||
                 --define "_topdir $$(pwd)" \
 | 
			
		||||
                 --define "_sourcedir $$(pwd)" \
 | 
			
		||||
                 @PACKAGENAME@.spec
 | 
			
		||||
 | 
			
		||||
deps = ${top_srcdir}/COPYING ${top_srcdir}/README ${top_srcdir}/INSTALL ${top_srcdir}/NEWS ${top_srcdir}/ChangeLog
 | 
			
		||||
 | 
			
		||||
@@ -59,4 +60,4 @@ distclean-local:
 | 
			
		||||
	- rm -r autom4te.cache
 | 
			
		||||
	- rm aclocal.m4 config.guess config.sub configure \
 | 
			
		||||
	     depcomp install-sh ltmain.sh makefile makefile.in \
 | 
			
		||||
	     missing mkinstalldirs
 | 
			
		||||
	     missing mkinstalldirs SPECS RPMS BUILD BUILDROOT SRPMS
 | 
			
		||||
 
 | 
			
		||||
@@ -40,9 +40,9 @@ This package contains only the shared libraries required at runtime.
 | 
			
		||||
%prep
 | 
			
		||||
%setup -q
 | 
			
		||||
CXXFLAGS="-O3" ./configure --prefix=/usr \
 | 
			
		||||
                           --datadir=/usr/share/doc/packages \
 | 
			
		||||
                           --enable-doxygen \
 | 
			
		||||
                           --libdir=/usr/%_lib
 | 
			
		||||
                           --libdir=/usr/%_lib \
 | 
			
		||||
                           --docdir=/usr/share/doc/packages/@PACKAGENAME@ \
 | 
			
		||||
                           --enable-doxygen
 | 
			
		||||
 | 
			
		||||
%build
 | 
			
		||||
make
 | 
			
		||||
@@ -56,6 +56,8 @@ rm -rf $RPM_BUILD_ROOT
 | 
			
		||||
%files
 | 
			
		||||
%defattr(-,root,root,-)
 | 
			
		||||
/usr/%_lib/*.so.*
 | 
			
		||||
/usr/share/pkgconfig
 | 
			
		||||
/usr/lib64/pkgconfig
 | 
			
		||||
%doc
 | 
			
		||||
/usr/share/doc/packages/@PACKAGENAME@/AUTHORS
 | 
			
		||||
/usr/share/doc/packages/@PACKAGENAME@/COPYING
 | 
			
		||||
@@ -78,10 +80,10 @@ This Package contains all files required for developement.
 | 
			
		||||
%defattr(-,root,root,-)
 | 
			
		||||
/usr/%_lib/*.so
 | 
			
		||||
/usr/%_lib/*.a
 | 
			
		||||
/usr/lib/*.la
 | 
			
		||||
/usr/%_lib/*.la
 | 
			
		||||
/usr/include
 | 
			
		||||
/usr/share/doc/packages/@PACKAGENAME@/examples
 | 
			
		||||
/usr/share/doc/packages/@PACKAGENAME@/doc
 | 
			
		||||
/usr/share/doc/packages/@PACKAGENAME@/html
 | 
			
		||||
/usr/share/doc/packages/@PACKAGENAME@/@PACKAGENAME@.spec
 | 
			
		||||
/usr/share/doc/packages/@PACKAGENAME@/INSTALL
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user