Merge pull request #328 from RichardHitt/master
install hicolor svg; reorganize some Makefile.am files
This commit is contained in:
		
						commit
						49f268d71e
					
				
					 5 changed files with 21 additions and 7 deletions
				
			
		|  | @ -1,13 +1,7 @@ | |||
| ## Process this file with automake to produce Makefile.in | ||||
| 
 | ||||
| SUBDIRS = po intl src plugins man | ||||
| SUBDIRS = po intl src plugins man share | ||||
| 
 | ||||
| EXTRA_DIST = autogen.sh | ||||
| 
 | ||||
| icon_DATA = src/pixmaps/hexchat.png | ||||
| icondir = $(datadir)/pixmaps | ||||
| 
 | ||||
| util_DATA = share/misc/hexchat.desktop | ||||
| utildir = $(datadir)/applications | ||||
| 
 | ||||
| ACLOCAL_AMFLAGS = -I m4 | ||||
|  |  | |||
|  | @ -950,6 +950,9 @@ AC_SUBST(hexchatlibdir) | |||
| 
 | ||||
| AC_OUTPUT([ | ||||
| Makefile | ||||
| share/Makefile | ||||
| share/icons/Makefile | ||||
| share/misc/Makefile | ||||
| src/Makefile | ||||
| src/common/Makefile | ||||
| src/common/dbus/Makefile | ||||
|  |  | |||
							
								
								
									
										1
									
								
								share/Makefile.am
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								share/Makefile.am
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1 @@ | |||
| SUBDIRS = icons misc | ||||
							
								
								
									
										13
									
								
								share/icons/Makefile.am
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								share/icons/Makefile.am
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,13 @@ | |||
| icon_DATA = ../../src/pixmaps/hexchat.png | ||||
| icondir = $(datadir)/icons/hicolor/48x48/apps | ||||
| 
 | ||||
| hicolor_DATA = hexchat.svg | ||||
| hicolordir = $(datadir)/icons/hicolor/scalable/apps | ||||
| 
 | ||||
| UPDATE_ICON_CACHE = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor | ||||
| 
 | ||||
| install-data-hook: | ||||
| 	$(UPDATE_ICON_CACHE); | ||||
| 
 | ||||
| uninstall-hook: | ||||
| 	$(UPDATE_ICON_CACHE); | ||||
							
								
								
									
										3
									
								
								share/misc/Makefile.am
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								share/misc/Makefile.am
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,3 @@ | |||
| util_DATA = hexchat.desktop | ||||
| utildir = $(datadir)/applications | ||||
| 
 | ||||
		Loading…
	
	Add table
		
		Reference in a new issue