From cafc131e8bc97368be6c0773a7b01a92499e721b Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Thu, 10 Sep 2020 11:46:00 -0400 Subject: [PATCH] LP#1778972: install templates-bootstrap by default Signed-off-by: Galen Charlton Signed-off-by: Jane Sandberg --- Makefile.am | 1 + Open-ILS/src/Makefile.am | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/Makefile.am b/Makefile.am index a732c8e4f0..7032ac2b7b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,6 +15,7 @@ export ETCDIR=@sysconfdir@ export WEBDIR=@localstatedir@/web export CGIDIR=@localstatedir@/cgi-bin export TEMPLATEDIR=@localstatedir@/templates +export BOOTSTRAPTEMPLATEDIR=@localstatedir@/templates-bootstrap export UPDATESDIR=@localstatedir@/updates export datadir=@localstatedir@/data diff --git a/Open-ILS/src/Makefile.am b/Open-ILS/src/Makefile.am index c7a8a42b4f..0f86c3620a 100644 --- a/Open-ILS/src/Makefile.am +++ b/Open-ILS/src/Makefile.am @@ -192,6 +192,7 @@ install-data-hook: $(OILSCORE_INST) $(OILSWEB_INST) $(OILSUPDATES_INST) $(OILSRE uninstall-hook: rm -R $(TEMPLATEDIR) + rm -R $(BOOTSTRAPTEMPLATEDIR) rm -R $(XSLDIR) rm -R $(CGIDIR) @@ -262,6 +263,9 @@ ilscore-install: $(MKDIR_P) $(DESTDIR)$(TEMPLATEDIR) @echo "Installing templates to $(DESTDIR)$(TEMPLATEDIR)" cp -r @srcdir@/templates/* $(DESTDIR)$(TEMPLATEDIR) + $(MKDIR_P) $(DESTDIR)$(BOOTSTRAPTEMPLATEDIR) + @echo "Installing Bootstrap templates to $(DESTDIR)$(BOOTSTRAPTEMPLATEDIR)" + cp -r @srcdir@/templates-bootstrap/* $(DESTDIR)$(BOOTSTRAPTEMPLATEDIR) -@if test -d @srcdir@/data/locale; then \ $(MKDIR_P) $(DESTDIR)$(datadir)/locale/ && \ echo "Installing template data files to $(datadir)/locale/" && \ -- 2.43.2