From efc96f10defe0c622c50d8fa9ddcea0773b5e850 Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: May 22 2018 16:27:50 +0000 Subject: Ticket 49689 - Fix local "make install" after adding cockpit subpackage Bug Description: When doing a local "make install" the cockpit UI files are not copied to the "buildroot", which then leads to rsync failing. Fix Description: If the "source directory" is not the same as the current directory, then its a local "make install" and not a "make rpms". In that case just copy over the cockpit ui directory to the local buildroot. This makes it easy to test Cockpit UI changes using "make install". https://pagure.io/389-ds-base/issue/49689 Reviewed by: mreynolds(one line commit rule) --- diff --git a/Makefile.am b/Makefile.am index 5e72f1a..ec22761 100644 --- a/Makefile.am +++ b/Makefile.am @@ -753,6 +753,7 @@ libexec_SCRIPTS = ldap/admin/src/scripts/ds_selinux_enabled \ wrappers/ds_systemd_ask_password_acl install-data-hook: + if [ "$(srcdir)" != "." ]; then cp -r $(srcdir)/src/cockpit src ; fi rsync -rupE src/cockpit/389-console/ $(DESTDIR)$(cockpitdir) if ENABLE_PERL