From eed0e7d9f627ee1efd41517f44fd4907164684f1 Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jpakkane@gmail.com>
Date: Mon, 23 Mar 2015 18:20:42 +0200
Subject: Moved rpm macros to a subdirectory to reduce clutter.

---
 data/macros.meson | 11 +++++++++++
 install_meson.py  |  4 ++--
 macros.meson      | 11 -----------
 3 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 data/macros.meson
 delete mode 100644 macros.meson

diff --git a/data/macros.meson b/data/macros.meson
new file mode 100644
index 0000000..42ad949
--- /dev/null
+++ b/data/macros.meson
@@ -0,0 +1,11 @@
+%__meson /usr/bin/meson
+
+%meson \
+  CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
+  CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
+  FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \
+  FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS ; \
+  %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \
+  %__meson \\\
+        --prefix=%{_prefix} \\\
+        --buildtype=plain
diff --git a/install_meson.py b/install_meson.py
index 2c13046..baea7cf 100755
--- a/install_meson.py
+++ b/install_meson.py
@@ -111,5 +111,5 @@ if os.path.exists('/usr/bin/rpm'):
     print('Installing RPM macros to %s.' % rpmmacros_dir)
     outfilename = os.path.join(rpmmacros_dir, 'macros.meson')
     os.makedirs(rpmmacros_dir, exist_ok=True)
-    shutil.copyfile('macros.meson', outfilename)
-    shutil.copystat('macros.meson', outfilename)
+    shutil.copyfile('data/macros.meson', outfilename)
+    shutil.copystat('data/macros.meson', outfilename)
diff --git a/macros.meson b/macros.meson
deleted file mode 100644
index 42ad949..0000000
--- a/macros.meson
+++ /dev/null
@@ -1,11 +0,0 @@
-%__meson /usr/bin/meson
-
-%meson \
-  CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
-  CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-  FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \
-  FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS ; \
-  %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \
-  %__meson \\\
-        --prefix=%{_prefix} \\\
-        --buildtype=plain
-- 
cgit v1.1