summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Cameron <brian.cameron@sun.com>2005-06-10 18:46:52 +0000
committerBrian Cameron <bcameron@src.gnome.org>2005-06-10 18:46:52 +0000
commit9b423f14b4b15f99fc6ddb81d130dfbba7db668f (patch)
tree0a88f88ec83ce494b6bb2de6f6e11c011d4a3d3c
parent3fc1fbe53389de122bb853fc74f9104797c3fff2 (diff)
downloadgdm-9b423f14b4b15f99fc6ddb81d130dfbba7db668f.tar.gz
Fixed so faces subdir builds with distcheck.GDM2_2_8_0_0
2005-06-10 Brian Cameron <brian.cameron@sun.com> * gui/faces/Makefile.am: Fixed so faces subdir builds with distcheck.
-rw-r--r--ChangeLog2
-rw-r--r--gui/faces/Makefile.am17
2 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e853aaf3..aec8a303 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
* configure.in: Updated version
* News: Updated
* gui/Makefile.am: Fixed so faces subdir gets distributed.
+ * gui/faces/Makefile.am: Fixed so faces subdir builds with
+ distcheck.
2005-06-10 Brian Cameron <brian.cameron@sun.com>
diff --git a/gui/faces/Makefile.am b/gui/faces/Makefile.am
index 4a46527b..1184e43e 100644
--- a/gui/faces/Makefile.am
+++ b/gui/faces/Makefile.am
@@ -1,7 +1,7 @@
imagedir = $(datadir)/pixmaps/faces
-IMGFILES = bonfire.jpg \
+EXTRA_DIST = bonfire.jpg \
cdrom.jpg \
clock.jpg \
daisy.jpg \
@@ -12,8 +12,6 @@ IMGFILES = bonfire.jpg \
sky.jpg \
skyline.jpg
-EXTRA_DIST = $(IMGFILES)
-
uninstall-hook:
rm -f $(DESTDIR)$(imagedir)/bonfire.jpg \
$(DESTDIR)$(imagedir)/cdrom.jpg \
@@ -26,11 +24,20 @@ uninstall-hook:
$(DESTDIR)$(imagedir)/sky.jpg \
$(DESTDIR)$(imagedir)/skyline.jpg
-install-data-hook: $(IMGFILES)
+install-data-hook: $(EXTRA_DIST)
if test '!' -d $(DESTDIR)$(imagedir); then \
$(mkinstalldirs) $(DESTDIR)$(imagedir); \
chmod 755 $(DESTDIR)$(imagedir); \
fi
- $(INSTALL_DATA) $(IMGFILES) $(DESTDIR)$(imagedir)
+ $(INSTALL_DATA) $(srcdir)/bonfire.jpg $(DESTDIR)$(imagedir)
+ $(INSTALL_DATA) $(srcdir)/cdrom.jpg $(DESTDIR)$(imagedir)
+ $(INSTALL_DATA) $(srcdir)/clock.jpg $(DESTDIR)$(imagedir)
+ $(INSTALL_DATA) $(srcdir)/daisy.jpg $(DESTDIR)$(imagedir)
+ $(INSTALL_DATA) $(srcdir)/dice.jpg $(DESTDIR)$(imagedir)
+ $(INSTALL_DATA) $(srcdir)/hollyleaf.jpg $(DESTDIR)$(imagedir)
+ $(INSTALL_DATA) $(srcdir)/lamas.jpg $(DESTDIR)$(imagedir)
+ $(INSTALL_DATA) $(srcdir)/seal.jpg $(DESTDIR)$(imagedir)
+ $(INSTALL_DATA) $(srcdir)/sky.jpg $(DESTDIR)$(imagedir)
+ $(INSTALL_DATA) $(srcdir)/skyline.jpg $(DESTDIR)$(imagedir)