diff options
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 7975994b..8f0bc4b2 100644 --- a/Makefile.am +++ b/Makefile.am | |||
@@ -6,6 +6,8 @@ desktopdir = $(datadir)/applications | |||
6 | desktop_in_files = gnunet-gtk.desktop.in | 6 | desktop_in_files = gnunet-gtk.desktop.in |
7 | desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) | 7 | desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) |
8 | 8 | ||
9 | pkgpixdir= $(pkgdatadir) | ||
10 | |||
9 | EXTRA_DIST = \ | 11 | EXTRA_DIST = \ |
10 | $(pkgdata_DATA) \ | 12 | $(pkgdata_DATA) \ |
11 | install-sh mkinstalldirs | 13 | install-sh mkinstalldirs |
@@ -14,24 +16,24 @@ pkgdata_DATA = \ | |||
14 | gnunet-gtk.glade | 16 | gnunet-gtk.glade |
15 | 17 | ||
16 | install-data-local: | 18 | install-data-local: |
17 | $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) | 19 | $(mkinstalldirs) $(DESTDIR)$(pkgpixdir) |
18 | $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/flags | 20 | $(mkinstalldirs) $(DESTDIR)$(pkgpixdir)/flags |
19 | @$(NORMAL_INSTALL) | 21 | @$(NORMAL_INSTALL) |
20 | for pixmap in $(srcdir)/pixmaps/*; do \ | 22 | for pixmap in $(srcdir)/pixmaps/*.{png,svg}; do \ |
21 | if test -f $$pixmap; then \ | 23 | if test -f $$pixmap; then \ |
22 | $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir); \ | 24 | $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgpixdir); \ |
23 | fi \ | 25 | fi \ |
24 | done | 26 | done |
25 | for flag in $(srcdir)/contrib/flags/*.png; do \ | 27 | for flag in $(srcdir)/contrib/flags/*.png; do \ |
26 | if test -f $$flag; then \ | 28 | if test -f $$flag; then \ |
27 | $(INSTALL_DATA) $$flag $(DESTDIR)$(pkgdatadir)/flags/ ; \ | 29 | $(INSTALL_DATA) $$flag $(DESTDIR)$(pkgpixdir)/flags/ ; \ |
28 | fi \ | 30 | fi \ |
29 | done | 31 | done |
30 | 32 | ||
31 | dist-hook: | 33 | dist-hook: |
32 | if test -d pixmaps; then \ | 34 | if test -d pixmaps; then \ |
33 | mkdir $(distdir)/pixmaps; \ | 35 | mkdir $(distdir)/pixmaps; \ |
34 | for pixmap in pixmaps/*; do \ | 36 | for pixmap in pixmaps/*.{png,svg}; do \ |
35 | if test -f $$pixmap; then \ | 37 | if test -f $$pixmap; then \ |
36 | cp -p $$pixmap $(distdir)/pixmaps; \ | 38 | cp -p $$pixmap $(distdir)/pixmaps; \ |
37 | fi \ | 39 | fi \ |