mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-14 17:24:01 +00:00
ICU-212 use @DATABUILDDIR@ instead of $(top_builddir)/data in install
targets. X-SVN-Rev: 954
This commit is contained in:
parent
3ce53a29c6
commit
d404d13d8b
2 changed files with 12 additions and 12 deletions
|
@ -152,7 +152,7 @@ build-basetestdata:
|
|||
@echo Generating the base test data file (base_test.dat) from (test.dat)
|
||||
@cp $(TESTDATAD) $(SRCDATADIR)/$(BASETESTDATA)
|
||||
@ls -l $(SRCDATADIR)/$(BASETESTDATA)
|
||||
|
||||
|
||||
# the files to be installed -- the COMMON ones + any stragglers
|
||||
UDATA_FILES=icudata.dat
|
||||
UDATA_DLLS=libicudata.$(SO)
|
||||
|
@ -245,14 +245,14 @@ install-everything: install-files install-dlls
|
|||
|
||||
install-files:
|
||||
@for file in $(UDATA_FILES); do \
|
||||
echo $(INSTALL_DATA) $(top_builddir)/data/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/$$file; \
|
||||
$(INSTALL_DATA) $(top_builddir)/data/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/$$file || exit; \
|
||||
echo $(INSTALL_DATA) @DATABUILDDIR@/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/$$file; \
|
||||
$(INSTALL_DATA) @DATABUILDDIR@/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/$$file || exit; \
|
||||
done
|
||||
|
||||
install-dlls:
|
||||
@for file in $(UDATA_DLLS); do \
|
||||
echo $(INSTALL_DATA) $(top_builddir)/data/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/$$file; \
|
||||
$(INSTALL_DATA) $(top_builddir)/data/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/$$file || exit; \
|
||||
echo $(INSTALL_DATA) @DATABUILDDIR@/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/$$file; \
|
||||
$(INSTALL_DATA) @DATABUILDDIR@/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/$$file || exit; \
|
||||
done
|
||||
|
||||
|
||||
|
|
|
@ -119,13 +119,13 @@ install-local: all-local
|
|||
$(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)/$(TARGET)
|
||||
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(VERSION)
|
||||
@list='$(notdir $(RES_FILES))'; for file in $$list; do \
|
||||
echo $(INSTALL_DATA) $(top_builddir)/data/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/$$file; \
|
||||
$(INSTALL_DATA) $(top_builddir)/data/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/$$file; \
|
||||
echo $(INSTALL_DATA) @DATABUILDDIR@/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/$$file; \
|
||||
$(INSTALL_DATA) @DATABUILDDIR@/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/$$file; \
|
||||
done
|
||||
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(VERSION)/translit
|
||||
@list='$(notdir $(TRANSLIT_RES))'; for file in $$list; do \
|
||||
echo $(INSTALL_DATA) $(top_builddir)/data/translit/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/translit/$$file; \
|
||||
$(INSTALL_DATA) $(top_builddir)/data/translit/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/translit/$$file; \
|
||||
echo $(INSTALL_DATA) @DATABUILDDIR@/translit/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/translit/$$file; \
|
||||
$(INSTALL_DATA) @DATABUILDDIR@/translit/$$file $(DESTDIR)$(pkgdatadir)/$(VERSION)/translit/$$file; \
|
||||
done
|
||||
|
||||
dist-local:
|
||||
|
@ -151,15 +151,15 @@ $(TARGET) : $(OBJECTS)
|
|||
|
||||
@DATABUILDDIR@/../source/test/testdata/%.res : $(top_srcdir)/test/testdata/%.txt
|
||||
@echo "Creating testdata resource file for $<"
|
||||
@ICU_DATA=$(top_builddir)/data/ ./genrb -D@DATABUILDDIR@/../source/test/testdata/ $<
|
||||
@ICU_DATA=@DATABUILDDIR@ ./genrb -D@DATABUILDDIR@/../source/test/testdata/ $<
|
||||
|
||||
@DATABUILDDIR@/translit/%.res : $(top_srcdir)/../data/translit/%.txt
|
||||
@echo "Creating translit resource file for $<"
|
||||
@ICU_DATA=$(top_builddir)/data/ ./genrb -D@DATABUILDDIR@/translit/ $<
|
||||
@ICU_DATA=@DATABUILDDIR@ ./genrb -D@DATABUILDDIR@/translit/ $<
|
||||
|
||||
@DATABUILDDIR@/%.res : $(top_srcdir)/../data/%.txt
|
||||
@echo "Creating compiled resource file for $<"
|
||||
@ICU_DATA=$(top_builddir)/data/ ./genrb -D@DATABUILDDIR@/ $<
|
||||
@ICU_DATA=@DATABUILDDIR@ ./genrb -D@DATABUILDDIR@/ $<
|
||||
|
||||
|
||||
# the 'mv' will always fail if you are building in the source dir
|
||||
|
|
Loading…
Add table
Reference in a new issue