summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStelios Tsampas2018-03-06 15:44:10 +0200
committerStelios Tsampas2018-03-06 15:44:10 +0200
commit84496e09e1383afd3f0cfeae6eac865de03f327d (patch)
tree24db4d388ce35b10e344e1b69abfa4bd6988e031
parent8d688e2535f5bdb7e1c36ffec0c42fcd3de2be64 (diff)
downloadaur-84496e09e1383afd3f0cfeae6eac865de03f327d.tar.gz
Patch Makefile to fix permission issues
-rw-r--r--PKGBUILD2
-rw-r--r--astylewx-destdir.patch25
2 files changed, 18 insertions, 9 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 9c73f7a292f..e7c86411704 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ depends=('wxgtk2' 'astyle')
source=("https://downloads.sourceforge.net/project/$pkgname.astyle.p/$pkgname/$pkgname $pkgver/${pkgname}_${pkgver}_linux.tar.gz"
'astylewx-destdir.patch')
md5sums=('06a72203f953440ff254eb69940b4517'
- 'cb9226bb562f88b09f57f3fd708fff3b')
+ 'fb3b2f359c4faef4087331e71471b7c2')
prepare() {
cd "${pkgname}_${pkgver}_linux/$pkgname/build/gcc"
diff --git a/astylewx-destdir.patch b/astylewx-destdir.patch
index 678cc6184d5..e45c6053258 100644
--- a/astylewx-destdir.patch
+++ b/astylewx-destdir.patch
@@ -1,31 +1,40 @@
--- astylewx/build/gcc/Makefile 2017-08-02 16:25:49.551415970 +0300
+++ astylewx/build/gcc/Makefile 2017-08-02 16:28:48.864180891 +0300
+@@ -57,7 +57,7 @@
+ -I../../src -I../../dialog -I../../image
+ LDBASEFLAGS = -L../../../AStyle/build/gcc/bin -L../../../astyle/build/gcc/bin
+ CXX = g++
+-INSTALL=install -o $(USER) -g $(USER)
++INSTALL=install
+
+ ##################################################
+
@@ -162,20 +162,20 @@
# The two last install commands will fail if Gnome is not installed or is not at $(prefix).
# This is OK - just means no AStyleWx in the Gnome Applications menu
install:
- $(INSTALL) -m 755 -d $(ibindir)
- $(INSTALL) -m 755 $(bindir)/astylewx $(ibindir)
-+ $(INSTALL) -m 755 -d $(DESTDIR)/$(ibindir)
-+ $(INSTALL) -m 755 $(bindir)/astylewx $(DESTDIR)/$(ibindir)
++ $(INSTALL) -m 755 -d $(DESTDIR)$(ibindir)
++ $(INSTALL) -m 755 $(bindir)/astylewx $(DESTDIR)$(ibindir)
- $(INSTALL) -m 755 -d $(SYSCONF_PATH)
- @mkdir -p $(SYSCONF_PATH)/html;
-+ $(INSTALL) -m 755 -d $(DESTDIR)/$(SYSCONF_PATH)
-+ @mkdir -p $(DESTDIR)/$(SYSCONF_PATH)/html;
++ $(INSTALL) -m 755 -d $(DESTDIR)$(SYSCONF_PATH)
++ @mkdir -p $(DESTDIR)$(SYSCONF_PATH)/html;
@for files in ../../doc/*.html ../../doc/*.css; \
do \
- $(INSTALL) -m 644 "$$files" $(SYSCONF_PATH)/html; \
-+ $(INSTALL) -m 644 "$$files" $(DESTDIR)/$(SYSCONF_PATH)/html; \
++ $(INSTALL) -m 644 "$$files" $(DESTDIR)$(SYSCONF_PATH)/html; \
done
ifdef gnomeprefix
- $(INSTALL) -m 755 -d $(idatadir)/applications $(ipixmapdir)
- $(INSTALL) -m 755 ../../image/AStyleWx.desktop $(idatadir)/applications/astylewx.desktop
- $(INSTALL) -m 644 ../../image/AStyle_32.xpm $(ipixmapdir)/astyle-32.xpm
-+ $(INSTALL) -m 755 -d $(DESTDIR)/$(idatadir)/applications $(DESTDIR)/$(ipixmapdir)
-+ $(INSTALL) -m 755 ../../image/AStyleWx.desktop $(DESTDIR)/$(idatadir)/applications/astylewx.desktop
-+ $(INSTALL) -m 644 ../../image/AStyle_32.xpm $(DESTDIR)/$(ipixmapdir)/astyle-32.xpm
++ $(INSTALL) -m 755 -d $(DESTDIR)$(idatadir)/applications $(DESTDIR)$(ipixmapdir)
++ $(INSTALL) -m 755 ../../image/AStyleWx.desktop $(DESTDIR)$(idatadir)/applications/astylewx.desktop
++ $(INSTALL) -m 644 ../../image/AStyle_32.xpm $(DESTDIR)$(ipixmapdir)/astyle-32.xpm
endif
uninstall: