diff options
| author | Peter Jones <pjones@redhat.com> | 2007-02-06 18:36:26 +0000 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2007-02-06 18:36:26 +0000 |
| commit | 8fb98139017ff979547fda56741699b9a0feb16d (patch) | |
| tree | 7eb7be0cd4b6ebec60f4640dc4110c915b70c09b | |
| parent | 50f10dc4ea15d0aac9cabce9a4143e56e799d895 (diff) | |
| download | anaconda-8fb98139017ff979547fda56741699b9a0feb16d.tar.gz anaconda-8fb98139017ff979547fda56741699b9a0feb16d.tar.xz anaconda-8fb98139017ff979547fda56741699b9a0feb16d.zip | |
- Actually install keymaps from keymaps/ (#182325)
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | keymaps/Makefile | 2 | ||||
| -rw-r--r-- | loader2/Makefile | 1 |
4 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,11 @@ +2007-02-06 Peter Jones <pjones@redhat.com> + + * Makefile: add keymaps to SUBDIRS (#182325) + + * loader2/Makefile: get rid of bogus keymaps install rule + + * keymaps/Makefile: put loader2's keymaps install rule here + 2007-02-02 Dave Lehman <dlehman@redhat.com> * anaconda.spec: Bump version. @@ -5,7 +5,7 @@ RELEASE := $(shell awk '/Release:/ { print $$2 }' anaconda.spec) SUBDIRS = isys loader2 po stubs \ textw utils scripts bootdisk installclasses \ - iw pixmaps isomd5sum command-stubs + iw pixmaps isomd5sum command-stubs keymaps # fonts aren't on s390/s390x ifneq (s390, $(ARCH)) ifneq (s390x, $(ARCH)) diff --git a/keymaps/Makefile b/keymaps/Makefile index 8eeddf11f..0cfdac63f 100644 --- a/keymaps/Makefile +++ b/keymaps/Makefile @@ -5,7 +5,7 @@ all: depend: install: - install -m 644 keymaps-$(ARCH) $(DESTDIR)/$(RUNTIMEDIR) + if [ -f keymaps-$(ARCH) ]; then install -m 644 keymaps-$(ARCH) $(DESTDIR)/$(RUNTIMEDIR)/keymaps-override-$(ARCH) ; fi clean: diff --git a/loader2/Makefile b/loader2/Makefile index 1177afc36..fd8d7b6d7 100644 --- a/loader2/Makefile +++ b/loader2/Makefile @@ -141,7 +141,6 @@ install: all install -m 755 $$n $(DESTDIR)/$(RUNTIMEDIR)/loader; \ strip $(DESTDIR)/$(RUNTIMEDIR)/loader/$$n || :; \ done - if [ -f keymaps-$(ARCH) ]; then cp keymaps-$(ARCH) $(DESTDIR)/$(RUNTIMEDIR)/keymaps-override-$(ARCH) ; fi install -m 644 loader.tr $(DESTDIR)/$(RUNTIMEDIR)/loader install -m 644 module-info $(DESTDIR)/$(RUNTIMEDIR)/loader install -m 644 font.bgf.gz $(DESTDIR)/$(RUNTIMEDIR)/loader |