From 836e4059a2bb67484a8d01a1beaef245cde10cfe Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Fri, 28 Apr 2017 23:32:55 +0500 Subject: Fixed incorrect chmod on installed by makefile files. --- skypeweb/Makefile | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/skypeweb/Makefile b/skypeweb/Makefile index 605eee9..5f21a3d 100644 --- a/skypeweb/Makefile +++ b/skypeweb/Makefile @@ -7,6 +7,9 @@ WIN32_DEV_TOP ?= $(PIDGIN_TREE_TOP)/../win32-dev WIN32_CC ?= $(WIN32_DEV_TOP)/mingw-4.7.2/bin/gcc PKG_CONFIG ?= pkg-config +DIR_PERM = 0755 +LIB_PERM = 0755 +FILE_PERM = 0644 CFLAGS ?= -O2 -g -pipe LDFLAGS ?= @@ -93,23 +96,23 @@ libskypeweb3.dll: $(PURPLE_C_FILES) $(WIN32_CC) -shared -o $@ $^ $(WIN32_PIDGIN3_CFLAGS) $(WIN32_PIDGIN3_LDFLAGS) install: $(SKYPEWEB_TARGET) install-icons install-theme - mkdir -p $(SKYPEWEB_DEST) - install -p $(SKYPEWEB_TARGET) $(SKYPEWEB_DEST) + mkdir -m $(DIR_PERM) -p $(SKYPEWEB_DEST) + install -m $(LIB_PERM) -p $(SKYPEWEB_TARGET) $(SKYPEWEB_DEST) install-icons: icons/16/skype.png icons/22/skype.png icons/48/skype.png icons/16/skypeout.png icons/22/skypeout.png icons/48/skypeout.png - mkdir -p $(SKYPEWEB_ICONS_DEST)/16 - mkdir -p $(SKYPEWEB_ICONS_DEST)/22 - mkdir -p $(SKYPEWEB_ICONS_DEST)/48 - install icons/16/skype.png $(SKYPEWEB_ICONS_DEST)/16/skype.png - install icons/22/skype.png $(SKYPEWEB_ICONS_DEST)/22/skype.png - install icons/48/skype.png $(SKYPEWEB_ICONS_DEST)/48/skype.png - install icons/16/skypeout.png $(SKYPEWEB_ICONS_DEST)/16/skypeout.png - install icons/22/skypeout.png $(SKYPEWEB_ICONS_DEST)/22/skypeout.png - install icons/48/skypeout.png $(SKYPEWEB_ICONS_DEST)/48/skypeout.png + mkdir -m $(DIR_PERM) -p $(SKYPEWEB_ICONS_DEST)/16 + mkdir -m $(DIR_PERM) -p $(SKYPEWEB_ICONS_DEST)/22 + mkdir -m $(DIR_PERM) -p $(SKYPEWEB_ICONS_DEST)/48 + install -m $(FILE_PERM) icons/16/skype.png $(SKYPEWEB_ICONS_DEST)/16/skype.png + install -m $(FILE_PERM) icons/22/skype.png $(SKYPEWEB_ICONS_DEST)/22/skype.png + install -m $(FILE_PERM) icons/48/skype.png $(SKYPEWEB_ICONS_DEST)/48/skype.png + install -m $(FILE_PERM) icons/16/skypeout.png $(SKYPEWEB_ICONS_DEST)/16/skypeout.png + install -m $(FILE_PERM) icons/22/skypeout.png $(SKYPEWEB_ICONS_DEST)/22/skypeout.png + install -m $(FILE_PERM) icons/48/skypeout.png $(SKYPEWEB_ICONS_DEST)/48/skypeout.png install-theme: theme - mkdir -p $(SKYPEWEB_THEME_DEST) - install theme $(SKYPEWEB_THEME_DEST)/theme + mkdir -m $(DIR_PERM) -p $(SKYPEWEB_THEME_DEST) + install -m $(FILE_PERM) theme $(SKYPEWEB_THEME_DEST)/theme FAILNOPURPLE: echo "You need libpurple development headers installed to be able to compile this plugin" -- cgit v1.2.3 From cc946f036ba1b6e697ecff4fe7c2c6b935a50583 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sat, 29 Apr 2017 00:11:23 +0500 Subject: Add missing -p parameter to install command. --- skypeweb/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/skypeweb/Makefile b/skypeweb/Makefile index 5f21a3d..233f45c 100644 --- a/skypeweb/Makefile +++ b/skypeweb/Makefile @@ -103,16 +103,16 @@ install-icons: icons/16/skype.png icons/22/skype.png icons/48/skype.png icons/16 mkdir -m $(DIR_PERM) -p $(SKYPEWEB_ICONS_DEST)/16 mkdir -m $(DIR_PERM) -p $(SKYPEWEB_ICONS_DEST)/22 mkdir -m $(DIR_PERM) -p $(SKYPEWEB_ICONS_DEST)/48 - install -m $(FILE_PERM) icons/16/skype.png $(SKYPEWEB_ICONS_DEST)/16/skype.png - install -m $(FILE_PERM) icons/22/skype.png $(SKYPEWEB_ICONS_DEST)/22/skype.png - install -m $(FILE_PERM) icons/48/skype.png $(SKYPEWEB_ICONS_DEST)/48/skype.png - install -m $(FILE_PERM) icons/16/skypeout.png $(SKYPEWEB_ICONS_DEST)/16/skypeout.png - install -m $(FILE_PERM) icons/22/skypeout.png $(SKYPEWEB_ICONS_DEST)/22/skypeout.png - install -m $(FILE_PERM) icons/48/skypeout.png $(SKYPEWEB_ICONS_DEST)/48/skypeout.png + install -m $(FILE_PERM) -p icons/16/skype.png $(SKYPEWEB_ICONS_DEST)/16/skype.png + install -m $(FILE_PERM) -p icons/22/skype.png $(SKYPEWEB_ICONS_DEST)/22/skype.png + install -m $(FILE_PERM) -p icons/48/skype.png $(SKYPEWEB_ICONS_DEST)/48/skype.png + install -m $(FILE_PERM) -p icons/16/skypeout.png $(SKYPEWEB_ICONS_DEST)/16/skypeout.png + install -m $(FILE_PERM) -p icons/22/skypeout.png $(SKYPEWEB_ICONS_DEST)/22/skypeout.png + install -m $(FILE_PERM) -p icons/48/skypeout.png $(SKYPEWEB_ICONS_DEST)/48/skypeout.png install-theme: theme mkdir -m $(DIR_PERM) -p $(SKYPEWEB_THEME_DEST) - install -m $(FILE_PERM) theme $(SKYPEWEB_THEME_DEST)/theme + install -m $(FILE_PERM) -p theme $(SKYPEWEB_THEME_DEST)/theme FAILNOPURPLE: echo "You need libpurple development headers installed to be able to compile this plugin" -- cgit v1.2.3