[Fedora-livecd-list] livecd-tools.spec Makefile

Jeremy Katz katzj at fedoraproject.org
Thu Aug 28 23:44:35 UTC 2008


 Makefile          |    2 --
 livecd-tools.spec |    5 ++---
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit af9dc183e7e8e613948598933cb61bf262821294
Author: Jeremy Katz <katzj at redhat.com>
Date:   Thu Aug 28 19:42:15 2008 -0400

    Stop installing the minimal config; just make it %doc

diff --git a/Makefile b/Makefile
index a8d8659..ef45cae 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,6 @@ install: man
 	$(INSTALL_DATA) -D README $(DESTDIR)/usr/share/doc/livecd-tools-$(VERSION)/README
 	$(INSTALL_DATA) -D HACKING $(DESTDIR)/usr/share/doc/livecd-tools-$(VERSION)/HACKING
 	mkdir -p $(DESTDIR)/usr/share/livecd-tools/
-	$(INSTALL_DATA) -D config/*.ks $(DESTDIR)/usr/share/livecd-tools/
 	mkdir -p $(DESTDIR)/$(PYTHONDIR)/imgcreate
 	$(INSTALL_PYTHON) -D imgcreate/*.py $(DESTDIR)/$(PYTHONDIR)/imgcreate/
 	$(call COMPILE_PYTHON,$(DESTDIR)/$(PYTHONDIR)/imgcreate)
@@ -41,7 +40,6 @@ uninstall:
 	rm -f $(DESTDIR)/usr/bin/livecd-creator
 	rm -rf $(DESTDIR)/usr/lib/livecd-creator
 	rm -rf $(DESTDIR)/usr/share/doc/livecd-tools-$(VERSION)
-	rm -rf $(DESTDIR)/usr/share/livecd-tools
 
 dist : all
 	git-archive --format=tar --prefix=livecd-tools-$(VERSION)/ HEAD | bzip2 -9v > livecd-tools-$(VERSION).tar.bz2
diff --git a/livecd-tools.spec b/livecd-tools.spec
index ce4fea8..a5ca5ec 100644
--- a/livecd-tools.spec
+++ b/livecd-tools.spec
@@ -50,13 +50,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README HACKING
+%doc AUTHORS COPYING README HACKING API
+%doc config/livecd-fedora-minimal.ks
 %{_mandir}/man*/*
 %{_bindir}/livecd-creator
 %{_bindir}/livecd-iso-to-disk
 %{_bindir}/livecd-iso-to-pxeboot
-%dir %{_datadir}/livecd-tools
-%{_datadir}/livecd-tools/*
 %{_bindir}/image-creator
 %dir %{python_sitelib}/imgcreate
 %{python_sitelib}/imgcreate/*.py





More information about the Fedora-livecd-list mailing list