From 26c7bcbf7f0f14c86067510f2bc455bac0ec57a7 Mon Sep 17 00:00:00 2001 From: Chris Sharp Date: Wed, 27 May 2020 12:51:29 -0400 Subject: [PATCH] repair makefiles Signed-off-by: Chris Sharp --- Open-ILS/src/extras/install/Makefile.centos | 7 +++++-- Open-ILS/src/extras/install/Makefile.rhel | 17 +++++++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Open-ILS/src/extras/install/Makefile.centos b/Open-ILS/src/extras/install/Makefile.centos index dbe83b0a59..7ce3d4ecd2 100644 --- a/Open-ILS/src/extras/install/Makefile.centos +++ b/Open-ILS/src/extras/install/Makefile.centos @@ -92,9 +92,12 @@ DEVELOPER_RPMS = \ chromium-headless \ firefox -all: +all: install_indexdata_repo install_rpms install_cpan + +install_indexdata_repo: make -f $(DIR)/Makefile.common install_indexdata_centos_repo - install_rpms + +install_cpan: make -f $(DIR)/Makefile.common install_cpan make -f $(DIR)/Makefile.common install_cpan_force make -f $(DIR)/Makefile.common install_cpan_pgsql diff --git a/Open-ILS/src/extras/install/Makefile.rhel b/Open-ILS/src/extras/install/Makefile.rhel index 6866fd0bce..cc09076ab9 100644 --- a/Open-ILS/src/extras/install/Makefile.rhel +++ b/Open-ILS/src/extras/install/Makefile.rhel @@ -87,9 +87,18 @@ PGSQL_RPMS = \ postgresql-plperl \ postgresql-server -all: +DEVELOPER_RPMS = \ + autoconf \ + automake \ + chromium-headless \ + firefox + +all: install_indexdata_repo install_rpms install_cpan + +install_indexdata_repo: make -f $(DIR)/Makefile.common install_indexdata_centos_repo - install_rpms + +install_cpan: make -f $(DIR)/Makefile.common install_cpan make -f $(DIR)/Makefile.common install_cpan_force make -f $(DIR)/Makefile.common install_cpan_pgsql @@ -102,6 +111,10 @@ install_rpms: yum -y update yum -y install $(RPMS) +install_developer: + yum -y install $(DEVELOPER_RPMS) + make -f $(DIR)/Makefile.common install_nodejs_from_source + clean: make -f $(DIR)/Makefile.common clean -- 2.11.0