From 756d2d08c5699d35dc8a7e54ade6959f102287f4 Mon Sep 17 00:00:00 2001
From: Justin Gassner <justin.gassner@mailbox.org>
Date: Thu, 26 Sep 2019 11:50:54 +0200
Subject: dmenu,dwm,slock,st: use environment build flags

---
 dmenu/PKGBUILD | 8 +++++---
 dwm/PKGBUILD   | 7 +++++--
 slock/PKGBUILD | 7 +++++--
 st/PKGBUILD    | 7 +++++--
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/dmenu/PKGBUILD b/dmenu/PKGBUILD
index 060cbfa..743d1eb 100644
--- a/dmenu/PKGBUILD
+++ b/dmenu/PKGBUILD
@@ -22,18 +22,20 @@ pkgver(){
 
 prepare() {
   cd "$_pkgname"
+  echo "CPPFLAGS+=${CPPFLAGS}" >> config.mk
+  echo "CFLAGS+=${CFLAGS}" >> config.mk
+  echo "LDFLAGS+=${LDFLAGS}" >> config.mk
   mv config.def.h config.h
 }
 
 build() {
   cd "$_pkgname"
-  make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
   make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 FREETYPEINC=/usr/include/freetype2
 }
 
 package() {
   cd "$_pkgname"
   make PREFIX=/usr DESTDIR="$pkgdir" install
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
-  install -Dm644 README "$pkgdir/usr/share/doc/$_pkgname/README"
+  install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
+  install -Dm644 README -t "$pkgdir/usr/share/doc/$_pkgname"
 }
diff --git a/dwm/PKGBUILD b/dwm/PKGBUILD
index 996c3a7..24a3731 100644
--- a/dwm/PKGBUILD
+++ b/dwm/PKGBUILD
@@ -25,6 +25,9 @@ prepare() {
   for branch in noborder pertag fancybar config; do
     git merge --no-edit origin/$branch
   done
+  echo "CPPFLAGS+=${CPPFLAGS}" >> config.mk
+  echo "CFLAGS+=${CFLAGS}" >> config.mk
+  echo "LDFLAGS+=${LDFLAGS}" >> config.mk
   mv config.def.h config.h
 }
 
@@ -36,6 +39,6 @@ build() {
 package() {
   cd "$_pkgname"
   make PREFIX=/usr DESTDIR="$pkgdir" install
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
-  install -Dm644 README "$pkgdir/usr/share/doc/$_pkgname/README"
+  install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
+  install -Dm644 README -t "$pkgdir/usr/share/doc/$_pkgname"
 }
diff --git a/slock/PKGBUILD b/slock/PKGBUILD
index c3a1dd4..ae29452 100644
--- a/slock/PKGBUILD
+++ b/slock/PKGBUILD
@@ -25,6 +25,9 @@ prepare() {
   for branch in config; do
     git merge --no-edit origin/$branch
   done
+  echo "CPPFLAGS+=${CPPFLAGS}" >> config.mk
+  echo "CFLAGS+=${CFLAGS}" >> config.mk
+  echo "LDFLAGS+=${LDFLAGS}" >> config.mk
   mv config.def.h config.h
 }
 
@@ -36,6 +39,6 @@ build() {
 package() {
   cd "$_pkgname"
   make PREFIX=/usr DESTDIR="$pkgdir" install
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
-  install -Dm644 README "$pkgdir/usr/share/doc/$_pkgname/README"
+  install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
+  install -Dm644 README -t "$pkgdir/usr/share/doc/$_pkgname"
 }
diff --git a/st/PKGBUILD b/st/PKGBUILD
index 9dcca2e..2157609 100644
--- a/st/PKGBUILD
+++ b/st/PKGBUILD
@@ -25,6 +25,9 @@ prepare() {
   for branch in no-bold-colors solarized-dark scrollback config; do
     git merge --no-edit origin/$branch
   done
+  echo "CPPFLAGS+=${CPPFLAGS}" >> config.mk
+  echo "CFLAGS+=${CFLAGS}" >> config.mk
+  echo "LDFLAGS+=${LDFLAGS}" >> config.mk
   mv config.def.h config.h
 }
 
@@ -36,6 +39,6 @@ build() {
 package() {
   cd "$_pkgname"
   make PREFIX=/usr DESTDIR="$pkgdir" install
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
-  install -Dm644 README "$pkgdir/usr/share/doc/$_pkgname/README"
+  install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
+  install -Dm644 README -t "$pkgdir/usr/share/doc/$_pkgname"
 }
-- 
cgit v1.2.3-54-g00ecf