Browse Source

Changes in the setup to install new icons

Miguel de Icaza 26 years ago
parent
commit
bb2110493c
5 changed files with 54 additions and 4 deletions
  1. 1 1
      Make.common.in
  2. 1 1
      Makefile.in
  3. 1 1
      configure.in
  4. 3 1
      icons/Makefile.in
  5. 48 0
      new_icons/Makefile.in

+ 1 - 1
Make.common.in

@@ -23,7 +23,7 @@ suppbindir = $(libdir)/bin
 tidir      = $(libdir)/term
 extfsdir   = $(libdir)/extfs
 datadir    = @datadir@
-icondir    = $(datadir)/icons/mc
+icondir    = $(datadir)/pixmaps/mc
 localedir  = $(datadir)/locale
 basemandir = @mandir@
 mandir     = $(basemandir)/man1

+ 1 - 1
Makefile.in

@@ -5,7 +5,7 @@ rootdir = $(srcdir)
 @MCFGR@@MCF@
 
 foreigndirs=pc
-codedirs=vfs lib doc slang edit gtkedit src gnome icons idl
+codedirs=vfs lib doc slang edit gtkedit src gnome new_icons idl
 unixdirs=intl $(codedirs) @POSUB@
 alldirs=$(unixdirs) $(foreigndirs) 
 subdirs=$(alldirs)

+ 1 - 1
configure.in

@@ -1263,7 +1263,7 @@ src/Makefile
 slang/Makefile 
 edit/Makefile 
 gtkedit/Makefile 
-icons/Makefile 
+new_icons/Makefile 
 
 lib/mc.ext
 lib/mc-gnome.ext

+ 3 - 1
icons/Makefile.in

@@ -31,7 +31,9 @@ ALLICONS = a.xpm application.xpm binary.xpm bitmap.xpm blackhole.xpm \
 
 all:
 
-install: @insticons@
+install:
+
+installx: @insticons@
 
 install_icons:
 	for I in $(ALLICONS); \

+ 48 - 0
new_icons/Makefile.in

@@ -0,0 +1,48 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+rootdir = $(srcdir)/..
+@MCFG@@MCF@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+
+#
+# Distribution variables
+#
+
+DISTICONS = Makefile.in $(ALLICONS)
+ALLICONS = 
+
+all:
+
+install: @insticons@
+
+install_icons:
+	for I in $(ALLICONS); \
+	do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(icondir)/$$I; done
+
+uninstall:
+	for I in $(ALLICONS); \
+	do $(RMF) $(DESTDIR)$(icondir)/$$I; done
+	-rmdir $(DESTDIR)$(icondir)
+
+check:
+	@echo no tests are supplied.
+
+TAGS:
+
+cross:
+
+clean:
+
+realclean:
+
+distclean:
+	-$(RMF) $(srcdir)/*~ $(srcdir)/Makefile
+
+distcopy:
+	$(CP) $(DISTICONS) ../../mc-$(VERSION)/icons
+
+depend dep: