diff --git a/ChangeLog b/ChangeLog index a9cb1b696..f7c2879b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-09-19 Tim Waugh + * src/Makefile.am: Fix build when builddir != srcdir. + * gramps.spec.in: Ship grampslib.so. + 2003-09-18 Alex Roitman * src/Makefile.am: Install grampslib under $pkglibdir/$PACKAGE * src/Makefile.in: Likewise. diff --git a/gramps.spec.in b/gramps.spec.in index adac3c837..8481cf5ff 100644 --- a/gramps.spec.in +++ b/gramps.spec.in @@ -78,6 +78,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/* %{_datadir}/pixmaps/gramps.png +%{_libdir}/gramps %{_datadir}/gramps/* %{_datadir}/omf/gramps @@ -88,6 +89,8 @@ if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi %changelog +* Fri Sep 19 2003 Tim Waugh +- Ship %%{_libdir}/gramps. * Mon May 20 2003 Donald Peterson - Override RPMs default of localstatedir to /var/lib.. This is done in accordance with GNOME and FHS compliance guidelines diff --git a/src/Makefile.am b/src/Makefile.am index be400d466..94330235e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -165,7 +165,7 @@ install-data-local: $(INSTALL) -d $(DESTDIR)$(prefix)/share/gnome/apps/Applications $(INSTALL_DATA) $(srcdir)/gramps.desktop $(DESTDIR)$(prefix)/share/gnome/apps/Applications $(INSTALL) -d $(pkglibdir) - $(INSTALL_DATA) $(srcdir)/grampslib.so $(pkglibdir) + $(INSTALL_DATA) grampslib.so $(pkglibdir) uninstall-local: -rm $(DESTDIR)$(prefix)/share/pixmaps/gramps.png