andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make the server distcheck:

Browse Source 
- Fix up the XpConfig directory to remove the stuff it installs
- Add a few files to CLEANFILES here and there
This commit is contained in:
Søren Sandmann Pedersen 2005-09-28 20:38:42 +00:00
parent 58abce3f90
commit c65fde5343
9 changed files with 81 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XpConfig/C/print/Makefile.am
View File

@ -10,3 +10,5 @@ Xprinters.ghostscript: $(srcdir)/Xprinters
dist_xpc_DATA = Xprinters dist_xpc_DATA = Xprinters
xpc_DATA = Xprinters.ghostscript xpc_DATA = Xprinters.ghostscript
CLEANFILES = Xprinters.ghostscript

31
XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am
View File

@ -1,6 +1,6 @@
xpcdir = @xpconfigdir@/C/print/models/SPSPARC2/fonts xpcdir = @xpconfigdir@/C/print/models/CANONC3200-PS/fonts
parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts
XPFONTS = \ XPFONTS = \
AvantGarde-Book.pmf \ AvantGarde-Book.pmf \
@ -34,18 +34,21 @@ XPFONTS = \
Times-Roman.pmf \ Times-Roman.pmf \
ZapfDingbats.pmf ZapfDingbats.pmf
install-data-hook: dest = $(DESTDIR)$(xpcdir)
mkdir -p $(xpcdir) ; \
\ remove-stuff:
for x in $(XPFONTS) ; do \ for x in $(XPFONTS) ; do \
rm -f $(xpcdir)/$$x ; \ rm -f $(dest)/$$x ; \
ln -s $(parentdir)/$$x $(xpcdir)/$$x ; \
done done
@rm -f $(xpcdir)/fonts.scale @rm -f $(dest)/fonts.dir
$(MKFONTSCALE) $(xpcdir)
@rm -f $(xpcdir)/font.dir
$(MKFONTDIR) $(xpcdir)
distuninstallcheck: install-data-hook: remove-stuff
@: mkdir -p $(dest) ; \
for x in $(XPFONTS) ; do \
ln -s $(parentdir)/$$x $(dest)/$$x ; \
done
$(MKFONTSCALE) -b -s -l $(dest)
uninstall-hook: remove-stuff

31
XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile.am
View File

@ -1,6 +1,6 @@
xpcdir = @xpconfigdir@/C/print/models/SPSPARC2/fonts xpcdir = @xpconfigdir@/C/print/models/HPLJ4050-PS/fonts
parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts
XPFONTS = \ XPFONTS = \
AvantGarde-Book.pmf \ AvantGarde-Book.pmf \
@ -34,18 +34,21 @@ XPFONTS = \
Times-Roman.pmf \ Times-Roman.pmf \
ZapfDingbats.pmf ZapfDingbats.pmf
install-data-hook: dest = $(DESTDIR)$(xpcdir)
mkdir -p $(xpcdir) ; \
\ remove-stuff:
for x in $(XPFONTS) ; do \ for x in $(XPFONTS) ; do \
rm -f $(xpcdir)/$$x ; \ rm -f $(dest)/$$x ; \
ln -s $(parentdir)/$$x $(xpcdir)/$$x ; \
done done
@rm -f $(xpcdir)/fonts.scale @rm -f $(dest)/fonts.dir
$(MKFONTSCALE) $(xpcdir)
@rm -f $(xpcdir)/font.dir
$(MKFONTDIR) $(xpcdir)
distuninstallcheck: install-data-hook: remove-stuff
@: mkdir -p $(dest) ; \
for x in $(XPFONTS) ; do \
ln -s $(parentdir)/$$x $(dest)/$$x ; \
done
$(MKFONTSCALE) -b -s -l $(dest)
uninstall-hook: remove-stuff

2
XpConfig/C/print/models/Makefile.am
View File

@ -1,4 +1,5 @@
SUBDIRS = \ SUBDIRS = \
PSdefault \
CANONBJ10E-GS \ CANONBJ10E-GS \
CANONC3200-PS \ CANONC3200-PS \
GSdefault \ GSdefault \
@ -6,6 +7,5 @@ SUBDIRS = \
HPLJ4050-PS \ HPLJ4050-PS \
HPLJ4family \ HPLJ4family \
PS2PDFspooldir-GS \ PS2PDFspooldir-GS \
PSdefault \
PSspooldir \ PSspooldir \
SPSPARC2 SPSPARC2

9
XpConfig/C/print/models/PSdefault/Makefile.am
View File

@ -3,12 +3,3 @@ SUBDIRS = fonts
xpcdir = @xpconfigdir@/C/print/models/PSdefault xpcdir = @xpconfigdir@/C/print/models/PSdefault
dist_xpc_DATA = model-config dist_xpc_DATA = model-config
install-data-hook:
@rm -f $(xpcdir)/fonts.scale
$(MKFONTSCALE) $(xpcdir)
@rm -f $(xpcdir)/font.dir
$(MKFONTDIR) $(xpcdir)
distuninstallcheck:
@:

16
XpConfig/C/print/models/PSdefault/fonts/Makefile.am
View File

@ -32,11 +32,13 @@ dist_xpc_DATA = \
Times-Roman.pmf \ Times-Roman.pmf \
ZapfDingbats.pmf ZapfDingbats.pmf
install-data-hook:
@rm -f $(xpcdir)/fonts.scale
$(MKFONTSCALE) $(xpcdir)
@rm -f $(xpcdir)/font.dir
$(MKFONTDIR) $(xpcdir)
distuninstallcheck: dest = $(DESTDIR)$(xpcdir)
@:
remove-stuff:
@rm -f $(dest)/fonts.dir
install-data-hook: remove-stuff
$(MKFONTSCALE) -b -s -l $(dest)
uninstall-hook: remove-stuff

29
XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am
View File

@ -1,6 +1,6 @@
xpcdir = @xpconfigdir@/C/print/models/SPSPARC2/fonts xpcdir = @xpconfigdir@/C/print/models/SPSPARC2/fonts
parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts
XPFONTS = \ XPFONTS = \
Courier-Bold.pmf \ Courier-Bold.pmf \
@ -17,18 +17,21 @@ XPFONTS = \
Times-Italic.pmf \ Times-Italic.pmf \
Times-Roman.pmf Times-Roman.pmf
install-data-hook: dest = $(DESTDIR)$(xpcdir)
mkdir -p $(xpcdir) ; \
\ remove-stuff:
for x in $(XPFONTS) ; do \ for x in $(XPFONTS) ; do \
rm -f $(xpcdir)/$$x ; \ rm -f $(dest)/$$x ; \
ln -s $(parentdir)/$$x $(xpcdir)/$$x ; \
done done
@rm -f $(xpcdir)/fonts.scale rm -f $(dest)/fonts.dir
$(MKFONTSCALE) $(xpcdir)
@rm -f $(xpcdir)/font.dir
$(MKFONTDIR) $(xpcdir)
distuninstallcheck: install-data-hook: remove-stuff
@: mkdir -p $(dest) ; \
for x in $(XPFONTS) ; do \
ln -s $(parentdir)/$$x $(dest)/$$x ; \
done
$(MKFONTSCALE) -b -s -l $(dest)
uninstall-hook: remove-stuff

28
XpConfig/Makefile.am
View File

@ -683,26 +683,30 @@ US_LOCALES= \
yi_US \ yi_US \
yi_US.cp1255 yi_US.cp1255
install-data-local: dest = $(DESTDIR)$(xpconfigdir)
mkdir -p $(xpconfigdir) ; \
mkdir -p $(xpconfigdir)/C; \ remove-links:
mkdir -p $(xpconfigdir)/en_US; \
\
for dir in $(US_LOCALES) ; do \ for dir in $(US_LOCALES) ; do \
rm -f $(xpconfigdir)/$${dir} ; \ rm -f $(dest)/$${dir} ; \
done ; \ done ; \
\ \
for dir in $(C_LOCALES) ; do \
rm -f $(dest)/$${dir} ; \
done ;
install-data-local: remove-links
mkdir -p $(dest) ; \
mkdir -p $(dest)/C; \
mkdir -p $(dest)/en_US; \
\
for dir in $(US_LOCALES) ; do \ for dir in $(US_LOCALES) ; do \
ln -s en_US $(xpconfigdir)/$${dir} ; \ ln -s en_US $(dest)/$${dir} ; \
done ; \ done ; \
\ \
for dir in $(C_LOCALES) ; do \ for dir in $(C_LOCALES) ; do \
rm -f $(xpconfigdir)/$${dir} ; \ ln -s en_US $(dest)/$${dir} ; \
done ; \
\
for dir in $(C_LOCALES) ; do \
ln -s en_US $(xpconfigdir)/$${dir} ; \
done ; done ;
uninstall-hook: remove-links
EXTRA_DIST = README EXTRA_DIST = README

3
hw/xfree86/utils/xorgcfg/Makefile.am
View File

@ -140,4 +140,7 @@ dist_man1_MANS = \
xorgcfg.man xorgcfg.man
EXTRA_DIST = $(XBM_DATA) $(XPM_DATA) XOrgCfg.pre EXTRA_DIST = $(XBM_DATA) $(XPM_DATA) XOrgCfg.pre
CLEANFILES = $(APPDEFAULTFILES)
endif endif