From bc4cacbe47f7d605e90e1696686ef7f46fa1ce99 Mon Sep 17 00:00:00 2001 From: Dan Church Date: Sun, 22 Mar 2020 12:21:53 -0500 Subject: [PATCH] Use datadir for xpm path Again, this follows autotools conventions. --- Local.mak.in | 1 + img/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Local.mak.in b/Local.mak.in index 3cf7291b..bd804c5c 100644 --- a/Local.mak.in +++ b/Local.mak.in @@ -33,5 +33,6 @@ docdir=@docdir@ htmldir=@htmldir@ mandir=@mandir@ bindir=@bindir@ +datadir=@datadir@ datarootdir=@datarootdir@ xca_prefix=${datarootdir}/${PACKAGE_TARNAME} diff --git a/img/Makefile b/img/Makefile index 8232db20..ee807184 100644 --- a/img/Makefile +++ b/img/Makefile @@ -13,7 +13,7 @@ include $(TOPDIR)/Rules.mak sinclude .depend install: xca-32x32.xpm - install -D -m 644 $^ $(DESTDIR)$(prefix)/share/pixmaps/xca-32x32.xpm + install -D -m 644 $^ $(DESTDIR)$(datadir)/pixmaps/xca-32x32.xpm imgres.cpp: imgres.rcc @$(PRINT) " RCC [$(BASENAME)] $@"