Verified Commit 42ab00a5 authored by Gaurav Mishra's avatar Gaurav Mishra 🐼 Committed by Gaurav Mishra

fix(install_offline): Fix install_offline recipe to run in install folder

Signed-off-by: Gaurav Mishra's avatarGaurav Mishra <gmishx@gmail.com>
parent 5aa9a204
...@@ -13,6 +13,7 @@ DIRS = install src ...@@ -13,6 +13,7 @@ DIRS = install src
# '$(subdir)' is equivalent to 'build-$(subdir)' # '$(subdir)' is equivalent to 'build-$(subdir)'
BUILDDIRS = $(DIRS:%=build-%) BUILDDIRS = $(DIRS:%=build-%)
INSTALLDIRS = $(DIRS:%=install-%) INSTALLDIRS = $(DIRS:%=install-%)
INSTALLDIRSOFFLINE = $(DIRS:%=install_offline-%)
UNINSTALLDIRS = $(DIRS:%=uninstall-%) UNINSTALLDIRS = $(DIRS:%=uninstall-%)
CLEANDIRS = $(DIRS:%=clean-%) CLEANDIRS = $(DIRS:%=clean-%)
TESTDIRS = $(DIRS:%=test-%) TESTDIRS = $(DIRS:%=test-%)
...@@ -45,6 +46,13 @@ $(INSTALLDIRS): ...@@ -45,6 +46,13 @@ $(INSTALLDIRS):
$(INSTALL) -m 666 VERSION $(DESTDIR)$(CONFPATH)/VERSION $(INSTALL) -m 666 VERSION $(DESTDIR)$(CONFPATH)/VERSION
$(MAKE) -C $(@:install-%=%) install $(MAKE) -C $(@:install-%=%) install
# offline install (without composer)
install_offline: all $(INSTALLDIRSOFFLINE)
$(INSTALL) -m 666 VERSION $(DESTDIR)$(CONFPATH)/VERSION
$(INSTALLDIRSOFFLINE):
$(MAKE) -C $(@:install_offline-%=%) install_offline
uninstall: $(UNINSTALLDIRS) uninstall: $(UNINSTALLDIRS)
$(UNINSTALLDIRS): $(UNINSTALLDIRS):
$(MAKE) -C $(@:uninstall-%=%) uninstall $(MAKE) -C $(@:uninstall-%=%) uninstall
...@@ -83,5 +91,5 @@ empty-cache: ...@@ -83,5 +91,5 @@ empty-cache:
.PHONY: $(BUILDDIRS) $(DIRS) $(INSTALLDIRS) $(UNINSTALLDIRS) .PHONY: $(BUILDDIRS) $(DIRS) $(INSTALLDIRS) $(UNINSTALLDIRS)
.PHONY: $(TESTDIRS) $(CLEANDIRS) .PHONY: $(TESTDIRS) $(CLEANDIRS)
.PHONY: all install uninstall clean test utils preparetest .PHONY: all install install_offline uninstall clean test utils preparetest
.PHONY: dist dist-testing tar tar-release .PHONY: dist dist-testing tar tar-release
...@@ -31,6 +31,8 @@ defconf/fossology.conf: defconf/fossology.conf-process ...@@ -31,6 +31,8 @@ defconf/fossology.conf: defconf/fossology.conf-process
# create dbcreate # create dbcreate
$(MAKE) -s -C db $(MAKE) -s -C db
install_offline: install
install: all install: all
$(INSTALL_PROGRAM) fo-postinstall $(DESTDIR)$(LIBEXECDIR)/fo-postinstall $(INSTALL_PROGRAM) fo-postinstall $(DESTDIR)$(LIBEXECDIR)/fo-postinstall
$(INSTALL_PROGRAM) fo_dbcheck.php $(DESTDIR)$(LIBEXECDIR)/fo_dbcheck.php $(INSTALL_PROGRAM) fo_dbcheck.php $(DESTDIR)$(LIBEXECDIR)/fo_dbcheck.php
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment