Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mp-xquery

diff --git a/Makefile b/Makefile
index bbe34d8..f6d7bf6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,24 @@
 SUBDIRS = src doc
 .PHONY: $(SUBDIRS) all
-
-all: $(SUBDIRS)
+prefix = /usr
+datadir = $(prefix)/share
+pkgdatadir = $(datadir)/mp-xquery
 
 CDEP=doc/common/common.ent
 
+all: $(SUBDIRS)
+
 $(SUBDIRS): $(CDEP)
        $(MAKE) -C $@
 
-clean install: $(CDEP)
+clean check: $(CDEP)
+       for d in $(SUBDIRS); do \
+               $(MAKE) -C $$d $@; \
+       done
+
+install:
+       mkdir -p $(DESTDIR)$(pkgdatadir)/bibframe
+       cp -r bibframe $(DESTDIR)$(pkgdatadir)
        for d in $(SUBDIRS); do \
                $(MAKE) -C $$d $@; \
        done

diff --git a/mp-xquery.spec b/mp-xquery.spec
index 9763ec6..6907fa3 100644 (file)
--- a/mp-xquery.spec
+++ b/mp-xquery.spec
@@ -52,7 +52,7 @@ make \
        MP_CONFIG=/usr/bin/metaproxy-config
 
 %install
-make DESTDIR=${RPM_BUILD_ROOT} libdir=%{_libdir} install
+make DESTDIR=${RPM_BUILD_ROOT} prefix=%{_prefix} libdir=%{_libdir} install
 
 %clean
 rm -fr ${RPM_BUILD_ROOT}
@@ -61,3 +61,4 @@ rm -fr ${RPM_BUILD_ROOT}
 %defattr(-,root,root)
 %{_libdir}/mp-xquery/*
 %{_mandir}/man3/xquery.*
+%{_datadir}/mp-xquery