kbd/kbd-1.14.1-Makefile.patch

59 lines
1.9 KiB
Diff
Raw Normal View History

temporary fix for 1.14.1, upstream switched to automake meanwhile
---
po/Makefile.in | 12 ++++++------
src/Makefile.in | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
--- kbd-1.14.1.orig/src/Makefile.in
+++ kbd-1.14.1/src/Makefile.in
@@ -14,16 +14,16 @@ PROGS = dumpkeys loadkeys showkey setf
# probably also getkeycodes and setkeycodes are arch-specific;
# they will work on an alpha, though, and perhaps be dummy on a sun
-ifeq ($(KEYCODES_PROGS),yes)
+ifeq (@KEYCODES_PROGS@,yes)
PROGS += getkeycodes setkeycodes
endif
-ifeq ($(RESIZECONS_PROGS),yes)
+ifeq (@RESIZECONS_PROGS@,yes)
PROGS += resizecons
endif
# Not installed by default
-ifeq ($(OPTIONAL_PROGS),yes)
+ifeq (@OPTIONAL_PROGS@,yes)
PROGS += screendump setlogcons setvesablank spawn_console spawn_login \
getunimap clrunimap outpsfheader setpalette
endif
--- kbd-1.14.1.orig/po/Makefile.in
+++ kbd-1.14.1/po/Makefile.in
@@ -2,10 +2,10 @@ PACKAGE_NAME = @PACKAGE_NAME@
prefix = @prefix@
datarootdir = @datarootdir@
-datadir = @datadir@
-localedir = $(DESTDIR)$(datadir)/locale
-gnulocaledir = $(DESTDIR)$(datadir)/locale
-gettextsrcdir = $(DESTDIR)$(datadir)/gettext/po
+datadir = $(DESTDIR)@datadir@
+localedir = $(DESTDIR)@localedir@
+gnulocaledir = $(DESTDIR)@localedir@
+gettextsrcdir = $(datadir)/gettext/po
FOREIGN = @FOREIGN@
HAVE_XGETTEXT = @HAVE_XGETTEXT@
@@ -34,10 +34,10 @@ INCLUDES = -I.. -I$(INTL)
COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
# Enter here all .po files
-POFILES = cs.po da.po de.po el.po es.po fr.po gr.po nl.po pl.po \
+POFILES = cs.po da.po de.po el.po es.po fr.po nl.po pl.po \
ro.po ru.po sv.po tr.po
# the same but with .gmo
-GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo gr.gmo nl.gmo \
+GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo nl.gmo \
pl.gmo ro.gmo ru.gmo sv.gmo tr.gmo
CATALOGS = $(GMOFILES)