Browse Source

Move some files from contrib into misc directory

Also fix error with make install action
Slava Zanko 16 years ago
parent
commit
f49ce170f0
10 changed files with 28 additions and 11 deletions
  1. 1 1
      Makefile.am
  2. 3 1
      configure.ac
  3. 2 8
      contrib/Makefile.am
  4. 1 1
      doc/Makefile.am
  5. 21 0
      misc/Makefile.am
  6. 0 0
      misc/cedit.menu
  7. 0 0
      misc/edit.indent.rc
  8. 0 0
      misc/edit.spell.rc
  9. 0 0
      misc/mc.ext.in
  10. 0 0
      misc/mc.lib

+ 1 - 1
Makefile.am

@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = 1.5
 
-SUBDIRS = intl po vfs edit src doc syntax contrib
+SUBDIRS = intl po vfs edit src doc syntax contrib misc
 
 EXTRA_DIST = 
 

+ 3 - 1
configure.ac

@@ -561,7 +561,9 @@ contrib/dist/redhat/mc.spec
 contrib/dist/mc.qpg
 contrib/dist/pkginfo
 contrib/dist/prototype
-contrib/mc.ext
+
+misc/Makefile
+misc/mc.ext
 
 src/Makefile
 src/search/Makefile

+ 2 - 8
contrib/Makefile.am

@@ -10,25 +10,19 @@ else
 LIBFILES_ADD =
 endif
 
-LIBFILES_OUT = mc.ext
-
-LIBFILES_CONST =  mc.lib mc.menu mc.menu.sr cedit.menu edit.indent.rc	\
-	edit.spell.rc
-
-noinst_DATA = README.xterm mcserv.init mcserv.pamd xterm.ad
+noinst_DATA = README.xterm mcserv.init mcserv.pamd
 
 SCRIPTS_IN = mc.csh.in mc.sh.in mc-wrapper.csh.in mc-wrapper.sh.in
 SCRIPTS_OUT = mc.csh mc.sh mc-wrapper.csh mc-wrapper.sh
 
 suppbin_SCRIPTS = $(SCRIPTS_OUT)
 
-pkgdata_DATA = $(LIBFILES_CONST) $(LIBFILES_ADD) $(LIBFILES_OUT)
+pkgdata_DATA = $(LIBFILES_ADD)
 
 CLEANFILES = $(SCRIPTS_OUT)
 
 # Files processed by configure don't need to be here
 EXTRA_DIST = \
-	$(LIBFILES_CONST) \
 	$(SCRIPTS_IN) \
 	$(noinst_DATA) \
 	mc.charsets

+ 1 - 1
doc/Makefile.am

@@ -3,7 +3,7 @@ SUBDIRS = hints man $(DOC_LINGUAS)
 
 pkgdata_DATA = mc.hlp
 
-EXTRA_DIST = xnc.hlp $(DX_CONFIG) doc/devel doxygen-include.am
+EXTRA_DIST = xnc.hlp $(DX_CONFIG) doxygen-include.am
 CLEANFILES = $(pkgdata_DATA)
 
 mc.hlp: man/mc.1 $(srcdir)/xnc.hlp $(top_builddir)/src/man2hlp

+ 21 - 0
misc/Makefile.am

@@ -0,0 +1,21 @@
+## Process this file with automake to create Makefile.in.
+
+
+LIBFILES_OUT = mc.ext
+
+LIBFILES_CONST =  mc.lib mc.menu mc.menu.sr cedit.menu edit.indent.rc	\
+	edit.spell.rc
+
+noinst_DATA = xterm.ad
+
+
+pkgdata_DATA = $(LIBFILES_CONST) $(LIBFILES_ADD) $(LIBFILES_OUT)
+
+CLEANFILES = $(SCRIPTS_OUT)
+
+# Files processed by configure don't need to be here
+EXTRA_DIST = \
+	$(LIBFILES_CONST) \
+	$(SCRIPTS_IN) \
+	$(noinst_DATA)
+

+ 0 - 0
contrib/cedit.menu → misc/cedit.menu


+ 0 - 0
contrib/edit.indent.rc → misc/edit.indent.rc


+ 0 - 0
contrib/edit.spell.rc → misc/edit.spell.rc


+ 0 - 0
contrib/mc.ext.in → misc/mc.ext.in


+ 0 - 0
contrib/mc.lib → misc/mc.lib


Some files were not shown because too many files changed in this diff