[gupnp-tools] Fix desktop file generation



commit c63983ea50b8c224787e9dc1e670d2e2104fbf7d
Author: Jens Georg <mail jensge org>
Date:   Wed Aug 17 16:59:30 2016 +0200

    Fix desktop file generation
    
    Signed-off-by: Jens Georg <mail jensge org>

 data/Makefile.am |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index f682cd6..7d40833 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -17,12 +17,13 @@ endif
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 desktop_in_in_files = $(desktop_in_files:.desktop.in=.desktop.in.in)
 
-$(desktop_in_files): $(desktop_in_in_files)
+%.desktop.in: %.desktop.in.in
        $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 # Substitute variables in a Desktop Entry file.
-$(desktop_DATA): $(desktop_in_files)
-       $(AM_V_GEN) $(SED) -e 's|@VERSION[@]|$(VERSION)|g' $< > $@
+%.desktop : %.desktop.in
+       $(AM_V_GEN) $(SED) -e 's|@VERSION[@]|$(VERSION)|g' \
+                                       -e 's|@PKGDATADIR[@]|$(PKGDATADIR)|g' $< > $@
 
 EXTRA_DIST = $(desktop_in_in_files) gupnp-av-cp.ui.in $(desktop_in_files)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]