diff --git a/Repositories/otago_eprints/Makefile b/Repositories/otago_eprints/Makefile index 086257b..0f80ef2 100755 --- a/Repositories/otago_eprints/Makefile +++ b/Repositories/otago_eprints/Makefile @@ -50,7 +50,7 @@ --recursive --times . $(EPRINTS_ROOT)/archives > .del-rsync-output @-grep $(ARCHIVE_NAME) .del-rsync-output @-grep --quiet "$(ARCHIVE_NAME)\\.xml" .del-rsync-output && $(MAKE) generate_apacheconf - @-grep --quiet "$(ARCHIVE_NAME)/cfg/subjects" .del-rsync-output && $(MAKE) import_subjects + @-grep --quiet "$(ARCHIVE_NAME)/cfg/subjects\\.xml" .del-rsync-output && $(MAKE) import_subjects @-grep --quiet "\\(otago_eprints/cfg/static/\\)\\|\\(\\.xml\\)" .del-rsync-output && $(MAKE) generate_static @-grep --quiet "\\(\\.pm\\)\\|\\(\\.xml\\)\|\($(ARCHIVE_NAME)/cfg/subjects\)" .del-rsync-output && $(MAKE) generate_views @-grep --quiet "\\($(ARCHIVE_NAME)/cfg/ArchiveRenderConfig.pm\\)\\|\\(\\.xml\\)" .del-rsync-output && $(MAKE) generate_abstracts @@ -74,7 +74,12 @@ @sudo -u $(EPRINTS_USER) $(BINDIR)/$@ -import_subjects generate_static generate_abstracts generate_views: +import_subjects: + @announce "$@ $(ARCHIVE_NAME)" + @sudo -u $(EPRINTS_USER) $(BINDIR)/$@ $(ARCHIVE_NAME) --xml $(ARCHIVE_NAME)/cfg/subjects.xml + + +generate_static generate_abstracts generate_views: @announce "$@ $(ARCHIVE_NAME)" @sudo -u $(EPRINTS_USER) $(BINDIR)/$@ $(ARCHIVE_NAME)