diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-11-14 21:04:14 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-11-14 21:04:14 +0000 |
| commit | 4b3f67ff4ccee2c341032cdb29ed008f278460d3 (patch) | |
| tree | 41d744fa920445f1a07b9759b3654e2011fead59 /data/Makefile | |
| parent | e6013cfab0c8f847ed296695fea1cbef6058bda3 (diff) | |
| download | cups-4b3f67ff4ccee2c341032cdb29ed008f278460d3.tar.gz | |
Merge changes from CUPS 1.4svn-r8131.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1060 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'data/Makefile')
| -rw-r--r-- | data/Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/data/Makefile b/data/Makefile index e0a85eb37..e518c8f01 100644 --- a/data/Makefile +++ b/data/Makefile @@ -47,6 +47,7 @@ CHARMAPS = \ iso-8859-7.txt \ iso-8859-8.txt \ iso-8859-9.txt \ + jis-x0213.txt \ koi8-r.txt \ koi8-u.txt \ mac-roman.txt \ @@ -141,9 +142,11 @@ install-data: $(INSTALL_DATA) $$file $(DATADIR)/charmaps; \ done $(INSTALL_DIR) -m 755 $(DATADIR)/charsets - for file in $(CHARSETS); do \ - $(INSTALL_DATA) $$file $(DATADIR)/charsets; \ - done + if test "x$(BANNERTOPS)" != x -o "x$(TEXTTOPS)" != x; then \ + for file in $(CHARSETS); do \ + $(INSTALL_DATA) $$file $(DATADIR)/charsets; \ + done; \ + fi $(INSTALL_DIR) -m 755 $(DATADIR)/data for file in $(DATAFILES); do \ $(INSTALL_DATA) $$file $(DATADIR)/data; \ |