rpms/dwdiff/devel dwdiff-localedir.patch,1.5,1.6
Jakub Hrozek
jhrozek at fedoraproject.org
Sun Mar 7 21:07:13 UTC 2010
Author: jhrozek
Update of /cvs/pkgs/rpms/dwdiff/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15849
Modified Files:
dwdiff-localedir.patch
Log Message:
fix build
dwdiff-localedir.patch:
Makefile.in | 3 ++-
configure | 4 ++++
2 files changed, 6 insertions(+), 1 deletion(-)
Index: dwdiff-localedir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dwdiff/devel/dwdiff-localedir.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- dwdiff-localedir.patch 7 Mar 2010 20:41:08 -0000 1.5
+++ dwdiff-localedir.patch 7 Mar 2010 21:07:13 -0000 1.6
@@ -1,6 +1,6 @@
diff -up ./configure.localedir ./configure
---- ./configure.localedir 2010-03-07 21:30:36.700275112 +0100
-+++ ./configure 2010-03-07 21:30:42.595276436 +0100
+--- ./configure.localedir 2010-02-13 11:03:27.000000000 +0100
++++ ./configure 2010-03-07 21:35:50.252004551 +0100
@@ -148,6 +148,7 @@ create_makefile() {
replace_default prefix "${PREFIX}"
replace_default mandir "${MANDIR}"
@@ -20,14 +20,22 @@ diff -up ./configure.localedir ./configu
MANDIR=`echo "${PARAM}" | sed 's/^--mandir=//'`
;;
diff -up ./Makefile.in.localedir ./Makefile.in
---- ./Makefile.in.localedir 2010-03-07 21:29:05.009275664 +0100
-+++ ./Makefile.in 2010-03-07 21:29:55.517570754 +0100
-@@ -81,7 +81,7 @@ dist-clean: clean
+--- ./Makefile.in.localedir 2010-02-13 11:03:26.000000000 +0100
++++ ./Makefile.in 2010-03-07 22:03:35.128020176 +0100
+@@ -34,6 +34,7 @@ GETTEXTLIBS=
+ # translations.
+ LOCALEDIR=$(prefix)/share/locale
+ LINGUAS=
++BIND_DIR=/usr/share/locale
+
+ # Unicode/ICU config
+ # If unicode support is to be enabled, the following flags should be set
+@@ -81,7 +82,7 @@ dist-clean: clean
rm -rf dwdiff config.log Makefile
.c.o:
- $(CC) $(CFLAGS) $(GETTEXTFLAGS) $(DIFF_FLAGS) -DDIFF=\"$(DIFF)\" -DDWDIFF=\"$(bindir)/dwdiff\" -DLOCALEDIR=\"$(LOCALEDIR)\" $(ICUFLAGS) -c -o $@ $<
-+ $(CC) $(CFLAGS) $(GETTEXTFLAGS) $(DIFF_FLAGS) -DDIFF=\"$(DIFF)\" -DDWDIFF=\"$(bindir)/dwdiff\" -DLOCALEDIR=\"$(BIND_DIR)\" $(ICUFLAGS) -c -o $@ $<
++ $(CC) $(CFLAGS) $(GETTEXTFLAGS) $(DIFF_FLAGS) -DDIFF=\"$(DIFF)\" -DLOCALEDIR=\"$(BIND_DIR)\" $(ICUFLAGS) -c -o $@ $<
dwdiff: $(OBJECTS_DWDIFF)
$(CC) $(CFLAGS) $(LDFLAGS) -o dwdiff $(OBJECTS_DWDIFF) $(LDLIBS) $(ICULIBS) $(GETTEXTLIBS)
More information about the scm-commits
mailing list