debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fontaliases: redo the way these are built, and actually install them

Browse Source 
Use a common make include file to do most of the work and set the
appropriate LANG from localized/templates/ .  This should simplify it
quite a bit and reduce duplication.

Also we were not even installing them, so now we are.
This commit is contained in:
Jon Trulson
2019-12-04 15:47:28 -07:00
parent 25035724af
commit 1b5d18f604
9 changed files with 23 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cde/programs/fontaliases/bdf/Makefile.am
View File

@@ -1,8 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
noinst_DATA = $(DTINFO_FONT)
DTINFO_FONT = dtinfo.pcf.gz DTINFO_FONT = dtinfo.pcf.gz
noinst_DATA = $(DTINFO_FONT)
BUILT_SOURCES = $(DTINFO_FONT) BUILT_SOURCES = $(DTINFO_FONT)
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)

5
cde/programs/fontaliases/bdf/fonts.inc → cde/programs/fontaliases/bdf/fonts.am
View File

@@ -1,5 +1,10 @@
# to be included by OS/LANG/Makefile.am's # to be included by OS/LANG/Makefile.am's
BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
CLEANFILES = $(BUILT_SOURCES)
fontdir = $(CDE_INSTALLATION_TOP)/config/xfonts/$(LANG)
dist_font_DATA = $(BUILT_SOURCES) fonts.alias
dtinfo.pcf.gz: $(top_builddir)/programs/fontaliases/bdf/dtinfo.pcf.gz dtinfo.pcf.gz: $(top_builddir)/programs/fontaliases/bdf/dtinfo.pcf.gz
$(RM) $@ $(RM) $@

7
cde/programs/fontaliases/freebsd/C/Makefile.am
View File

@@ -1,8 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
noinst_DATA = fonts.dir include ../../../localized/templates/C.am
include ../../bdf/fonts.am
BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
CLEANFILES = $(BUILT_SOURCES)
include $(top_builddir)/programs/fontaliases/bdf/fonts.inc

7
cde/programs/fontaliases/linux/C/Makefile.am
View File

@@ -1,8 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
noinst_DATA = fonts.dir include ../../../localized/templates/C.am
include ../../bdf/fonts.am
BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
CLEANFILES = $(BUILT_SOURCES)
include $(top_builddir)/programs/fontaliases/bdf/fonts.inc

7
cde/programs/fontaliases/linux/en_US.UTF-8/Makefile.am
View File

@@ -1,8 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
noinst_DATA = fonts.dir include ../../../localized/templates/English.am
include ../../bdf/fonts.am
BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
CLEANFILES = $(BUILT_SOURCES)
include $(top_builddir)/programs/fontaliases/bdf/fonts.inc

7
cde/programs/fontaliases/netbsd/C/Makefile.am
View File

@@ -1,8 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
noinst_DATA = fonts.dir include ../../../localized/templates/C.am
include ../../bdf/fonts.am
BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
CLEANFILES = $(BUILT_SOURCES)
include $(top_builddir)/programs/fontaliases/bdf/fonts.inc

7
cde/programs/fontaliases/openbsd/C/Makefile.am
View File

@@ -1,8 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
noinst_DATA = fonts.dir include ../../../localized/templates/C.am
include ../../bdf/fonts.am
BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
CLEANFILES = $(BUILT_SOURCES)
include $(top_builddir)/programs/fontaliases/bdf/fonts.inc

7
cde/programs/fontaliases/sun/C/Makefile.am
View File

@@ -1,8 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
noinst_DATA = fonts.dir include ../../../localized/templates/C.am
include ../../bdf/fonts.am
BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
CLEANFILES = $(BUILT_SOURCES)
include $(top_builddir)/programs/fontaliases/bdf/fonts.inc

5
cde/programs/localized/templates/English.am Normal file
View File

@@ -0,0 +1,5 @@
# This file is a template for setting the platform-specific LANG
# variable for the C locale.
LANG=en_US.UTF-8
SOURCE_LANG=en_US.UTF-8