[Tobu] Fix a bug when srcdir != builddir

This commit is contained in:
Yann Leboulanger 2007-05-04 16:38:28 +00:00
parent 3320bdc551
commit c276dc679c
2 changed files with 20 additions and 20 deletions

View File

@ -8,28 +8,28 @@ EMOTICONS_FILES = **/{*.png,*.gif,emoticons.py}
install-data-local: install-data-local:
@for d in $(EMOTICONS_DIRS);do \ @for d in $$(cd $(srcdir); echo $(EMOTICONS_DIRS));do \
if test -d $$d;then \ if test -d $(srcdir)/$$d;then \
echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/emoticons/$$d"; \ echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/emoticons/$$d"; \
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/emoticons/$$d || exit 1; \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/emoticons/$$d || exit 1; \
fi; \ fi; \
done; \ done; \
for f in $(EMOTICONS_FILES);do \ for f in $$(cd $(srcdir); echo $(EMOTICONS_FILES));do \
if test -f $$f; then \ if test -f $(srcdir)/$$f; then \
echo " $(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/data/emoticons/$$f"; \ echo " $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/emoticons/$$f"; \
$(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/data/emoticons/$$f || exit 1; \ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/emoticons/$$f || exit 1; \
fi; \ fi; \
done; done;
dist-hook: dist-hook:
@for d in $(EMOTICONS_DIRS);do \ @for d in $$(cd $(srcdir); echo $(EMOTICONS_DIRS));do \
if test -d $$d;then \ if test -d $(srcdir)/$$d;then \
echo " $(mkdir_p) $(distdir)/$$d"; \ echo " $(mkdir_p) $(distdir)/$$d"; \
$(mkdir_p) $(distdir)/$$d || exit 1; \ $(mkdir_p) $(distdir)/$$d || exit 1; \
fi; \ fi; \
done; \ done; \
for f in $(EMOTICONS_FILES);do \ for f in $$(cd $(srcdir); echo $(EMOTICONS_FILES));do \
if test -f $$f; then \ if test -f $(srcdir)/$$f; then \
echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \ echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \
cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \ cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \
fi; \ fi; \

View File

@ -9,28 +9,28 @@ ICONSET_FILES = **/{16x16,32x32,48x48}/{*.gif,*.png} \
transports/**/{16x16,32x32,48x48}/{*.gif,*.png} transports/**/{16x16,32x32,48x48}/{*.gif,*.png}
install-data-local: install-data-local:
@for d in $(ICONSET_DIRS);do \ @for d in $$(cd $(srcdir); echo $(ICONSET_DIRS));do \
if test -d $$d;then \ if test -d $(srcdir)/$$d;then \
echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/iconsets/$$d"; \ echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/iconsets/$$d"; \
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/iconsets/$$d || exit 1; \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/iconsets/$$d || exit 1; \
fi; \ fi; \
done done
for f in $(ICONSET_FILES);do \ for f in $$(cd $(srcdir); echo $(ICONSET_FILES));do \
if test -f $$f; then \ if test -f $(srcdir)/$$f; then \
echo " $(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/data/iconsets/$$f"; \ echo " $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/iconsets/$$f"; \
$(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/data/iconsets/$$f || exit 1; \ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/iconsets/$$f || exit 1; \
fi; \ fi; \
done; done;
dist-hook: dist-hook:
@for d in $(ICONSET_DIRS);do \ @for d in $$(cd $(srcdir); echo $(ICONSET_DIRS));do \
if test -d $$d;then \ if test -d $(srcdir)/$$d;then \
echo " $(mkdir_p) $(distdir)/$$d"; \ echo " $(mkdir_p) $(distdir)/$$d"; \
$(mkdir_p) $(distdir)/$$d || exit 1; \ $(mkdir_p) $(distdir)/$$d || exit 1; \
fi; \ fi; \
done done
for f in $(ICONSET_FILES);do \ for f in $$(cd $(srcdir); echo $(ICONSET_FILES));do \
if test -f $$f; then \ if test -f $(srcdir)/$$f; then \
echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \ echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \
cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \ cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \
fi; \ fi; \