remove some file that are already in data/ dir

install common files in pkgdatadir
2006-10-04 07:10:36 +00:00 · 2006-10-04 07:10:36 +00:00 · 81872c518c
parent 59b6ae468a
commit 81872c518c
5 changed files with 66 additions and 81 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -1,15 +1,19 @@
-SUBDIRS = po src data
+SUBDIRS = data src po
 bin_SCRIPTS = scripts/gajim

+commonfilesdir = $(pkgdatadir)
+commonfiles_DATA = COPYING	\
+				   README 	\
+				   ChangeLog \
+				   THANKS	\
+				   AUTHORS
+
 EXTRA_DIST =			\
-	autogen.sh		\
-	COPYING		\
-	ChangeLog  		\
-	README 			\
-	THANKS 			\
-	intltool-extract.in 	\
+	$(commonfiles_DATA) \
+	autogen.sh			\
+	intltool-extract.in \
 	intltool-merge.in 	\
-	intltool-update.in \
+	intltool-update.in	\
 	scripts/gajim.in
 	
 DISTCLEANFILES = 		\
--- a/Makefile.in
+++ b/Makefile.in
@ -14,6 +14,7 @@

@SET_MAKE@

+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@ -52,7 +53,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = scripts/gajim
-am__installdirs = "$(DESTDIR)$(bindir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(commonfilesdir)"
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(bin_SCRIPTS)
 SOURCES =
@ -63,6 +64,14 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	install-recursive installcheck-recursive installdirs-recursive \
 	pdf-recursive ps-recursive uninstall-info-recursive \
 	uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+commonfilesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(commonfiles_DATA)
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@ -245,17 +254,21 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-SUBDIRS = po src data
+SUBDIRS = data src po
 bin_SCRIPTS = scripts/gajim
+commonfilesdir = $(pkgdatadir)
+commonfiles_DATA = COPYING	\
+				   README 	\
+				   ChangeLog \
+				   THANKS	\
+				   AUTHORS
+
 EXTRA_DIST = \
-	autogen.sh		\
-	COPYING		\
-	ChangeLog  		\
-	README 			\
-	THANKS 			\
-	intltool-extract.in 	\
+	$(commonfiles_DATA) \
+	autogen.sh			\
+	intltool-extract.in \
 	intltool-merge.in 	\
-	intltool-update.in \
+	intltool-update.in	\
 	scripts/gajim.in

 DISTCLEANFILES = \
@ -349,6 +362,23 @@ clean-libtool:
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
+install-commonfilesDATA: $(commonfiles_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(commonfilesdir)" || $(mkdir_p) "$(DESTDIR)$(commonfilesdir)"
+	@list='$(commonfiles_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(commonfilesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(commonfilesdir)/$$f'"; \
+	  $(commonfilesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(commonfilesdir)/$$f"; \
+	done
+
+uninstall-commonfilesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(commonfiles_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(commonfilesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(commonfilesdir)/$$f"; \
+	done

 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@ -626,10 +656,10 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(SCRIPTS) config.h
+all-am: Makefile $(SCRIPTS) $(DATA) config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(bindir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(commonfilesdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-recursive
@ -677,7 +707,7 @@ info: info-recursive

 info-am:

-install-data-am:
+install-data-am: install-commonfilesDATA

 install-exec-am: install-binSCRIPTS

@ -705,7 +735,8 @@ ps: ps-recursive

 ps-am:

-uninstall-am: uninstall-binSCRIPTS uninstall-info-am
+uninstall-am: uninstall-binSCRIPTS uninstall-commonfilesDATA \
+	uninstall-info-am

 uninstall-info: uninstall-info-recursive

@ -716,14 +747,16 @@ uninstall-info: uninstall-info-recursive
 	distclean-generic distclean-hdr distclean-libtool \
 	distclean-recursive distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-binSCRIPTS install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-binSCRIPTS uninstall-info-am
+	install install-am install-binSCRIPTS install-commonfilesDATA \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-binSCRIPTS uninstall-commonfilesDATA \
+	uninstall-info-am

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/gajim-remote.1
+++ b/gajim-remote.1
@ -1,14 +0,0 @@
-.\" 20050818
-.TH "Gajim-remote" "1" "August  18, 2005" "Gajim dev team" ""
-.SH "NAME"
-Gajim-remote
-.SH "SYNOPSIS"
-.B gajim-remote [help] [toggle_roster_appearance] [show_next_unread] [list_contacts] [list_accounts] [change_status] [open_chat] [send_message] [send_file] [contact_info] [account_info] [send_file] [prefs_list] [prefs_put] [prefs_del] [prefs_store] [remove_contact] [add_contact] [get_status] [get_status_message] [get_unread_msgs_number] [start_chat] 
-.SH "DESCRIPTION"
-.B Gajim-remote 
-is a script to control Gajim by D-Bus
-.PP 
-.SH "FEEDBACK"
-You can report bugs or feature requests in http://trac.gajim.org or in the mailing list: https://lists.gajim.org/cgi\-bin/listinfo/gajim\-devel. You can also find us in our room gajim@conference.jabber.no
-.SH "AUTHORS"
-Written by Yann Le Boulanger <asterix@lagaule.org>, Nikos Kouremenos <kourem@gmail.com> and Dimitur Kirov <dkirov@gmail.com>.
--- a/gajim.1
+++ b/gajim.1
@ -1,25 +0,0 @@
-.\" 20050901
-.TH "Gajim" "1" "September 01, 2005" "Gajim dev team" ""
-.SH "NAME"
-Gajim \- a jabber client
-.SH "SYNOPSIS"
-.B gajim [\-v] [\-p] [\-h]
-.SH "DESCRIPTION"
-.B Gajim 
-is a jabber client written in PyGTK and released under the GNU GPL. For more information on jabber, see 
-http://www.jabber.org and on Gajim see http://www.gajim.org
-.PP 
-.SH "OPTIONS"
-.TP 
-\fB\-p\fR, \fB\-\-profile\fR name
-Run Gajim using ~/.gajim/config.name
-.TP 
-\fB\-v\fR, \fB\-\-verbose\fR
-Print xml stanzas and other debug information.
-.TP 
-\fB\-h\fR, \fB\-\-help\fR
-Print this help.
-.SH "FEEDBACK"
-You can report bugs or feature requests in http://trac.gajim.org or in the mailing list: https://lists.gajim.org/cgi\-bin/listinfo/gajim\-devel. You can also find us in our room gajim@conference.gajim.org
-.SH "AUTHORS"
-Written by Yann Le Boulanger <asterix@lagaule.org>, Nikos Kouremenos <kourem@gmail.com> and Dimitur Kirov <dkirov@gmail.com>.
--- a/gajim.desktop.in
+++ b/gajim.desktop.in
@ -1,13 +0,0 @@
-[Desktop Entry]
-Categories=Network;InstantMessaging;Application;GTK;GNOME;
-_Name=Gajim Instant Messenger
-_GenericName=Jabber IM Client
-_Comment=A GTK+ Jabber client
-Version=0.9.4
-Encoding=UTF-8
-Exec=gajim
-Icon=gajim.png
-StartupNotify=true
-StartupWMClass=Gajim
-Terminal=false
-Type=Application