HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't install pixmaps/geany.ico by default.

Browse Source 
Fix mandir path and don't delete icons (patch by Yura Siamashka, thanks).


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@2109 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2007-12-18 16:30:57 +00:00
parent 9a236fc554
commit 948ccf3a2d
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-12-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* Makefile.am: Don't install pixmaps/geany.ico by default.
* geany.spec.in: Fix mandir path and don't delete icons
(patch by Yura Siamashka, thanks).
2007-12-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* tagmanager/c.c:

6
Makefile.am
View File

@ -50,11 +50,7 @@ install-data-local:
@$(NORMAL_INSTALL)
if test -d $(srcdir)/pixmaps; then \
$(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps; \
for pixmap in $(srcdir)/pixmaps/*; do \
if test -f $$pixmap; then \
$(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/pixmaps; \
fi \
done \
$(INSTALL_DATA) pixmaps/geany.png $(DESTDIR)$(datadir)/pixmaps; \
fi
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir); \
$(INSTALL_DATA) $(srcdir)/data/global.tags $(DESTDIR)$(pkgdatadir); \

4
geany.spec.in
View File

@ -34,7 +34,7 @@ Some features:
%install
%__rm -Rf $RPM_BUILD_ROOT
%makeinstall
%__rm -Rf $RPM_BUILD_ROOT%{_datadir}/icons/
%__rm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
%__rm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.ico
%clean
@ -50,5 +50,5 @@ Some features:
%{_datadir}/locale/*/LC_MESSAGES/%{name}.mo
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/doc/%{name}/
%{_datadir}/man/man1/%{name}.1.gz
%{_mandir}/man1/%{name}.1.gz
%{_datadir}/icons/hicolor/16x16/apps/classviewer-*.png