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

[PATCH 3/4] Update po/Rules-* files to account for new directory structure.



From: David Cantrell <dcantrell redhat com>

---
 po/Rules-glade      |    6 +++---
 po/Rules-lang-table |   10 +++++-----
 po/Rules-liveinst   |   16 ++++++++--------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/po/Rules-glade b/po/Rules-glade
index b117c4e..e3d7308 100644
--- a/po/Rules-glade
+++ b/po/Rules-glade
@@ -1,9 +1,9 @@
-UI_SRCS = $(wildcard $(top_srcdir)/ui/*.glade)
+UI_SRCS = $(wildcard $(top_srcdir)/data/ui/*.glade)
 UI_HDRS = $(UI_SRCS:.glade=.glade.h)
 
 %.glade.h: %.glade
-	@cd $(top_builddir)/ui ; \
-	intltool-extract -q --type=gettext/glade -l $< ; \
+	@cd $(top_builddir)/data/ui ; \
+	intltool-extract -q --type=gettext/glade -l $$(basename $<) ; \
 	mv tmp/*h . ; \
 	rmdir tmp
 
diff --git a/po/Rules-lang-table b/po/Rules-lang-table
index 76c4692..e157d79 100644
--- a/po/Rules-lang-table
+++ b/po/Rules-lang-table
@@ -1,8 +1,8 @@
-$(top_builddir)/lang-table.h: $(top_srcdir)/lang-table
-	@rm -f $(top_builddir)/lang-table.h
-	@cat $(top_srcdir)/lang-table | cut -f 1 | while read lang ; do \
-		echo "char *s = N_(\"$${lang}\")" >> $(top_builddir)/lang-table.h ; \
+$(top_builddir)/data/lang-table.h: $(top_srcdir)/data/lang-table
+	@rm -f $(top_builddir)/data/lang-table.h
+	@cat $(top_srcdir)/data/lang-table | cut -f 1 | while read lang ; do \
+		echo "char *s = N_(\"$${lang}\")" >> $(top_builddir)/data/lang-table.h ; \
 	done
 
 mostlyclean-lang-table:
-	rm -f $(top_builddir)/lang-table.h
+	rm -f $(top_builddir)/data/lang-table.h
diff --git a/po/Rules-liveinst b/po/Rules-liveinst
index 2e359e3..b933c3b 100644
--- a/po/Rules-liveinst
+++ b/po/Rules-liveinst
@@ -1,17 +1,17 @@
-LIVEINST_SRCS = $(top_srcdir)/liveinst/liveinst.desktop.in $(top_srcdir)/liveinst/console.apps/liveinst
-LIVEINST_HDRS = $(top_builddir)/liveinst/liveinst.desktop.in.h $(top_srcdir)/liveinst/console.apps/liveinst.h
+LIVEINST_SRCS = $(top_srcdir)/data/liveinst/liveinst.desktop.in $(top_srcdir)/data/liveinst/console.apps/liveinst
+LIVEINST_HDRS = $(top_builddir)/data/liveinst/liveinst.desktop.in.h $(top_builddir)/data/liveinst/console.apps/liveinst.h
 
 %.desktop.in.h: %.desktop.in
-	@cd $(top_builddir)/liveinst ; \
-	intltool-extract -q --type=gettext/keys -l $< ; \
+	@cd $(top_builddir)/data/liveinst ; \
+	intltool-extract -q --type=gettext/keys -l $$(basename $<) ; \
 	mv tmp/*h . ; \
 	rmdir tmp
 
-%liveinst.h : %liveinst
-	@cd $(top_builddir)/liveinst/console.apps ; \
-	intltool-extract -q --type=gettext/quoted -l $(notdir $<) ; \
+%liveinst.h: %liveinst
+	@cd $(top_builddir)/data/liveinst/console.apps ; \
+	intltool-extract -q --type=gettext/quoted -l $$(basename $<) ; \
 	mv tmp/*h . ; \
-	rmdir tmp        
+	rmdir tmp
 
 mostlyclean-liveinst:
 	rm -f $(LIVEINST_HDRS)
-- 
1.6.6.1


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