summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYves Duret <yduret@mandriva.com>2001-08-09 23:33:14 +0000
committerYves Duret <yduret@mandriva.com>2001-08-09 23:33:14 +0000
commitbb7af121e49537022cb732a1aa5fa81f66cb8a2b (patch)
tree79c8720a9c9ec0ff81ab8cd0d1809227e6f60472
parent223e3845674e9c52a73c0cedc19c3f5d9b16c818 (diff)
downloadcontrol-center-bb7af121e49537022cb732a1aa5fa81f66cb8a2b.tar
control-center-bb7af121e49537022cb732a1aa5fa81f66cb8a2b.tar.gz
control-center-bb7af121e49537022cb732a1aa5fa81f66cb8a2b.tar.bz2
control-center-bb7af121e49537022cb732a1aa5fa81f66cb8a2b.tar.xz
control-center-bb7af121e49537022cb732a1aa5fa81f66cb8a2b.zip
minor corrections
-rw-r--r--DrakConf.spec3
-rw-r--r--Makefile5
2 files changed, 4 insertions, 4 deletions
diff --git a/DrakConf.spec b/DrakConf.spec
index 0394fc3b..f3e96914 100644
--- a/DrakConf.spec
+++ b/DrakConf.spec
@@ -85,8 +85,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-,root,root)
-#%doc ChangeLog README.CVS TRANSLATORS
-#%config(noreplace) /etc/mdkcc/*
+%doc COPYING
%{_prefix}/X11R6/bin/*
%{_menudir}/DrakConf
%{_miconsdir}/*.xpm
diff --git a/Makefile b/Makefile
index 521c6878..d74b188b 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ clean:
install: all
$(MAKE) -C po $@
- install -d $(RPM_BUILD_ROOT)/usr/{X11R6/bin/,share/icons}
+ install -d $(RPM_BUILD_ROOT)/usr/{X11R6/bin/,share/{icons,doc/$(NAME)-$(VERSION)}}
install -d $(RPM_BUILD_ROOT)/usr/sbin
install -s -m755 $(NAME) $(RPM_BUILD_ROOT)/usr/X11R6/bin/
install -m755 clock.pm $(RPM_BUILD_ROOT)/usr/sbin/
@@ -27,6 +27,7 @@ install: all
install -m755 logdrake $(RPM_BUILD_ROOT)/usr/sbin/
# install -m644 pixmaps/*.xpm $(RPM_BUILD_ROOT)/usr/share/icons/
install -m644 pixmaps/*.png $(RPM_BUILD_ROOT)/usr/share/icons/
+ install -m644 COPYING $(RPM_BUILD_ROOT)/usr/share/doc/$(NAME)-$(VERSION)/
for d in $(SUBDIRS); do ( cd $$d ; make $@ ) ; done
dis: clean
@@ -34,7 +35,7 @@ dis: clean
# cvs commit
mkdir -p $(NAME)-$(VERSION)
find . -not -name "$(NAME)-$(VERSION)"|cpio -pd $(NAME)-$(VERSION)/
- find $(NAME)-$(VERSION) -type d -name CVS -o -name .cvsignore -o -name unused -name control-center.rc -o -name controlcenter.html -o -name TODO -o -name mdkcc.spec -o -name demo |xargs rm -rf
+ find $(NAME)-$(VERSION) -type d -name CVS -o -name .cvsignore -o -name unused -name control-center.rc -o -name controlcenter.html |xargs rm -rf
tar cf ../$(NAME)-$(VERSION).tar $(NAME)-$(VERSION)
bzip2 -9f ../$(NAME)-$(VERSION).tar
rm -rf $(NAME)-$(VERSION)