diff options
| author | Robert Schweikert <rjschwei@suse.com> | 2017-08-09 14:10:33 -0400 |
|---|---|---|
| committer | Max Illfelder <illfelder@users.noreply.github.com> | 2017-08-09 11:10:33 -0700 |
| commit | 4107b965d5fa94d7220366a73b6712bc88a9653f (patch) | |
| tree | 5bc13bca0fd6f0ee4aff6ba73a59f65dea0a8771 | |
| parent | 37dc00a1baaa8b20a1693e1f34efb256d2655e5a (diff) | |
| download | google-compute-image-packages-4107b965d5fa94d7220366a73b6712bc88a9653f.tar.gz | |
Add separators to the OS Login Makefile (#451)
* - Add separators
+ Lets not assume that the user is diligent with adding separators
for directory assignments, especially for paths that are composed
internally in the Makefile. We may end up with double separators,
but the OS gnores those.
* - Remove superfluous separators
+ Remove the separator between DESTDIR and PREFIX to be in better
compliance with convention
| -rw-r--r-- | google_compute_engine_oslogin/Makefile | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/google_compute_engine_oslogin/Makefile b/google_compute_engine_oslogin/Makefile index 51d16f2..7e70019 100644 --- a/google_compute_engine_oslogin/Makefile +++ b/google_compute_engine_oslogin/Makefile @@ -103,25 +103,25 @@ install: $(NSS_LIBRARY_NAME) $(PAM_ADMIN_MOD) $(PAM_LOGIN_MOD) $(AUTHKEYS_BIN) $ else install: $(NSS_LIBRARY_NAME) $(PAM_ADMIN_MOD) $(PAM_LOGIN_MOD) $(AUTHKEYS_BIN) endif - mkdir -p $(DESTDIR)$(PREFIX)$(NSS_INSTALL_PATH) - mkdir -p $(DESTDIR)$(PREFIX)$(PAM_INSTALL_PATH) - mkdir -p $(DESTDIR)$(PREFIX)$(AUTHKEYS_INSTALL_PATH) - mkdir -p $(DESTDIR)$(PREFIX)$(BIN_INSTALL_PATH) - install -m 0644 $(NSS_LIBRARY_NAME) $(DESTDIR)$(PREFIX)$(NSS_INSTALL_PATH) - install -m 0644 $(PAM_ADMIN_MOD) $(PAM_LOGIN_MOD) $(DESTDIR)$(PREFIX)$(PAM_INSTALL_PATH) - install -m 0755 $(AUTHKEYS_BIN) $(DESTDIR)$(PREFIX)$(AUTHKEYS_INSTALL_PATH) - install -m 0755 $(OSLOGIN_HELPER) $(DESTDIR)$(PREFIX)$(BIN_INSTALL_PATH) + mkdir -p $(DESTDIR)$(PREFIX)/$(NSS_INSTALL_PATH) + mkdir -p $(DESTDIR)$(PREFIX)/$(PAM_INSTALL_PATH) + mkdir -p $(DESTDIR)$(PREFIX)/$(AUTHKEYS_INSTALL_PATH) + mkdir -p $(DESTDIR)$(PREFIX)/$(BIN_INSTALL_PATH) + install -m 0644 $(NSS_LIBRARY_NAME) $(DESTDIR)$(PREFIX)/$(NSS_INSTALL_PATH) + install -m 0644 $(PAM_ADMIN_MOD) $(PAM_LOGIN_MOD) $(DESTDIR)$(PREFIX)/$(PAM_INSTALL_PATH) + install -m 0755 $(AUTHKEYS_BIN) $(DESTDIR)$(PREFIX)/$(AUTHKEYS_INSTALL_PATH) + install -m 0755 $(OSLOGIN_HELPER) $(DESTDIR)$(PREFIX)/$(BIN_INSTALL_PATH) ifdef INSTALL_SELINUX - mkdir -p $(DESTDIR)$(PREFIX)$(SELINUX_INSTALL_PATH) - install -T -m 0644 $(SELINUX_MODULE) $(DESTDIR)$(PREFIX)$(SELINUX_INSTALL_PATH)/$(SELINUX_INSTALL_NAME) + mkdir -p $(DESTDIR)$(PREFIX)/$(SELINUX_INSTALL_PATH) + install -T -m 0644 $(SELINUX_MODULE) $(DESTDIR)$(PREFIX)/$(SELINUX_INSTALL_PATH)/$(SELINUX_INSTALL_NAME) endif uninstall: - rm -f $(DESTDIR)$(PREFIX)$(NSS_INSTALL_PATH)/$(NSS_LIBRARY_NAME) - rm -f $(DESTDIR)$(PREFIX)$(PAM_INSTALL_PATH)/$(PAM_ADMIN_MOD) - rm -f $(DESTDIR)$(PREFIX)$(PAM_INSTALL_PATH)/$(PAM_LOGIN_MOD) - rm -f $(DESTDIR)$(PREFIX)$(AUTHKEYS_INSTALL_PATH)/$(AUTHKEYS_BIN) - rm -f $(DESTDIR)$(PREFIX)$(BIN_INSTALL_PATH)/$(OSLOGIN_HELPER) + rm -f $(DESTDIR)$(PREFIX)/$(NSS_INSTALL_PATH)/$(NSS_LIBRARY_NAME) + rm -f $(DESTDIR)$(PREFIX)/$(PAM_INSTALL_PATH)/$(PAM_ADMIN_MOD) + rm -f $(DESTDIR)$(PREFIX)/$(PAM_INSTALL_PATH)/$(PAM_LOGIN_MOD) + rm -f $(DESTDIR)$(PREFIX)/$(AUTHKEYS_INSTALL_PATH)/$(AUTHKEYS_BIN) + rm -f $(DESTDIR)$(PREFIX)/$(BIN_INSTALL_PATH)/$(OSLOGIN_HELPER) clean: rm -f $(UTILS) $(NSS_LIBRARY_NAME) $(PAM_ADMIN_OBJ) $(PAM_ADMIN_MOD) $(PAM_LOGIN_OBJ) $(PAM_LOGIN_MOD) $(AUTHKEYS_BIN) |