diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2010-09-10 22:22:09 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-10-22 12:36:31 +0200 |
| commit | a9d69637823834702fbe4360b8d89e5aa561a622 (patch) | |
| tree | 1a7e973a22cd55159cd30eaaeac5a9fba6f49423 /rules/xorg-lib-Xfont.make | |
| parent | b7a0b04420df68c2cb4a8bec12a8294e916b0578 (diff) | |
| download | ptxdist-a9d69637823834702fbe4360b8d89e5aa561a622.tar.gz ptxdist-a9d69637823834702fbe4360b8d89e5aa561a622.tar.xz | |
[xorg-lib-Xfont] targetinstall consolidation
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/xorg-lib-Xfont.make')
| -rw-r--r-- | rules/xorg-lib-Xfont.make | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/rules/xorg-lib-Xfont.make b/rules/xorg-lib-Xfont.make index f3a85619f..2b128463f 100644 --- a/rules/xorg-lib-Xfont.make +++ b/rules/xorg-lib-Xfont.make @@ -51,7 +51,7 @@ XORG_LIB_XFONT_AUTOCONF := \ # Use the global switch here to support freetype when # its present in the system # -ifdef PTXCONF_XORG_LIB_XFONT_FREETYPE +ifdef PTXCONF_XORG_LIB_XFONT_FREETYPE XORG_LIB_XFONT_AUTOCONF += --enable-freetype else XORG_LIB_XFONT_AUTOCONF += --disable-freetype @@ -100,16 +100,7 @@ $(STATEDIR)/xorg-lib-xfont.targetinstall: @$(call install_fixup, xorg-lib-xfont,AUTHOR,"Erwin Rol <ero@pengutronix.de>") @$(call install_fixup, xorg-lib-xfont,DESCRIPTION,missing) - @$(call install_copy, xorg-lib-xfont, 0, 0, 0644, -, \ - $(XORG_LIBDIR)/libXfont.so.1.4.1) - - @$(call install_link, xorg-lib-xfont, \ - libXfont.so.1.4.1, \ - $(XORG_LIBDIR)/libXfont.so.1) - - @$(call install_link, xorg-lib-xfont, \ - libXfont.so.1.4.1, \ - $(XORG_LIBDIR)/libXfont.so) + @$(call install_lib, xorg-lib-xfont, 0, 0, 0644, libXfont) @$(call install_finish, xorg-lib-xfont) |