Skip to content

Commit 1c41d1b

Browse files
committed
build: Don't install meson.build files
On the old build system, some themes are installed by simply copying the whole source directory over, so the recently added meson build files must be removed from those installations.
1 parent f5b2e04 commit 1c41d1b

File tree

1 file changed

+24
-12
lines changed

1 file changed

+24
-12
lines changed

common/Makefile.am

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,8 @@ if ENABLE_METACITY
146146
if ENABLE_LIGHT
147147
cp -R $(srcdir)/metacity-1 $(ithemedir)
148148

149-
cd $(ithemedir)/metacity-1 && rm metacity-theme-1-dark.xml metacity-theme-2-dark.xml thumbnail-dark.png
149+
cd $(ithemedir)/metacity-1 && rm metacity-theme-1-dark.xml metacity-theme-2-dark.xml thumbnail-dark.png && \
150+
rm meson.build
150151
endif # ENABLE_LIGHT
151152

152153
if ENABLE_DARKER
@@ -155,7 +156,8 @@ if ENABLE_DARKER
155156
cd $(ithemedarkerdir)/metacity-1 && \
156157
mv metacity-theme-1-dark.xml metacity-theme-1.xml && \
157158
mv metacity-theme-2-dark.xml metacity-theme-2.xml && \
158-
mv thumbnail-dark.png thumbnail.png
159+
mv thumbnail-dark.png thumbnail.png && \
160+
rm meson.build
159161
endif # ENABLE_DARKER
160162

161163
if ENABLE_DARK
@@ -164,13 +166,15 @@ if ENABLE_DARK
164166
cd $(ithemedarkdir)/metacity-1 && \
165167
mv metacity-theme-1-dark.xml metacity-theme-1.xml && \
166168
mv metacity-theme-2-dark.xml metacity-theme-2.xml && \
167-
mv thumbnail-dark.png thumbnail.png
169+
mv thumbnail-dark.png thumbnail.png && \
170+
rm meson.build
168171
endif # ENABLE_DARK
169172

170173
if ENABLE_LIGHTER
171174
cp -R $(srcdir)/metacity-1 $(ithemelighterdir)
172175

173-
cd $(ithemelighterdir)/metacity-1 && rm metacity-theme-1-dark.xml metacity-theme-2-dark.xml thumbnail-dark.png
176+
cd $(ithemelighterdir)/metacity-1 && rm metacity-theme-1-dark.xml metacity-theme-2-dark.xml thumbnail-dark.png && \
177+
rm meson.build
174178
endif # ENABLE_LIGHTER
175179

176180
endif # ENABLE_METACITY
@@ -181,29 +185,33 @@ if ENABLE_UNITY
181185
if ENABLE_LIGHT
182186
cp -R $(srcdir)/unity $(ithemedir)
183187

184-
cd $(ithemedir)/unity && rm -rf window-buttons-dark
188+
cd $(ithemedir)/unity && rm -rf window-buttons-dark && \
189+
rm meson.build
185190
endif # ENABLE_LIGHT
186191

187192
if ENABLE_DARKER
188193
cp -R $(srcdir)/unity $(ithemedarkerdir)
189194

190195
cd $(ithemedarkerdir)/unity && \
191196
rm -rf window-buttons && \
192-
mv window-buttons-dark window-buttons
197+
mv window-buttons-dark window-buttons && \
198+
rm meson.build
193199
endif # ENABLE_DARKER
194200

195201
if ENABLE_DARK
196202
cp -R $(srcdir)/unity $(ithemedarkdir)
197203

198204
cd $(ithemedarkdir)/unity && \
199205
rm -rf window-buttons && \
200-
mv window-buttons-dark window-buttons
206+
mv window-buttons-dark window-buttons && \
207+
rm meson.build
201208
endif # ENABLE_DARK
202209

203210
if ENABLE_LIGHTER
204211
cp -R $(srcdir)/unity $(ithemelighterdir)
205212

206-
cd $(ithemelighterdir)/unity && rm -rf window-buttons-dark
213+
cd $(ithemelighterdir)/unity && rm -rf window-buttons-dark && \
214+
rm meson.build
207215
endif # ENABLE_LIGHTER
208216

209217
endif # ENABLE_UNITY
@@ -214,27 +222,31 @@ if ENABLE_PLANK
214222
if ENABLE_LIGHT
215223
cp -R $(srcdir)/plank $(ithemedir)
216224

217-
cd $(ithemedir)/plank && rm dock-lighter.theme
225+
cd $(ithemedir)/plank && rm dock-lighter.theme && \
226+
rm meson.build
218227
endif # ENABLE_LIGHT
219228

220229
if ENABLE_DARKER
221230
cp -R $(srcdir)/plank $(ithemedarkerdir)
222231

223-
cd $(ithemedarkerdir)/plank && rm dock-lighter.theme
232+
cd $(ithemedarkerdir)/plank && rm dock-lighter.theme && \
233+
rm meson.build
224234
endif # ENABLE_DARKER
225235

226236
if ENABLE_DARK
227237
cp -R $(srcdir)/plank $(ithemedarkdir)
228238

229-
cd $(ithemedarkdir)/plank && rm dock-lighter.theme
239+
cd $(ithemedarkdir)/plank && rm dock-lighter.theme && \
240+
rm meson.build
230241
endif # ENABLE_DARK
231242

232243
if ENABLE_LIGHTER
233244
cp -R $(srcdir)/plank $(ithemelighterdir)
234245

235246
cd $(ithemelighterdir)/plank && \
236247
rm dock.theme && \
237-
mv dock-lighter.theme dock.theme
248+
mv dock-lighter.theme dock.theme && \
249+
rm meson.build
238250
endif # ENABLE_LIGHTER
239251

240252
endif # ENABLE_PLANK

0 commit comments

Comments
 (0)