[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] /srv/bzr/gsrc/trunk r1093: clean up gnutrition and fix ins
|
From: |
Brandon Invergo |
|
Subject: |
[Gsrc-commit] /srv/bzr/gsrc/trunk r1093: clean up gnutrition and fix install |
|
Date: |
Sat, 10 Nov 2012 12:49:18 +0100 |
|
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 1093
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sat 2012-11-10 12:49:18 +0100
message:
clean up gnutrition and fix install
added:
gnu/gnutrition/config.mk
gnu/gnutrition/files/
gnu/gnutrition/files/fix-install.diff
modified:
gnu/gnutrition/Makefile
gnu/gnutrition/sha256sums
=== modified file 'gnu/gnutrition/Makefile'
--- a/gnu/gnutrition/Makefile 2012-09-01 22:33:11 +0000
+++ b/gnu/gnutrition/Makefile 2012-11-10 11:49:18 +0000
@@ -1,16 +1,20 @@
GARNAME = gnutrition
GARVERSION = 0.32
+HOME_URL = http://www.gnu.org/software/gnutrition
+DESCRIPTION = Free nutrition analysis software
+
+######################################################################
MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = gnutrition/
-
+MASTER_SUBDIR = $(GARNAME)/
DISTFILES = $(DISTNAME).tar.gz
SIGFILES = $(DISTNAME).tar.gz.sig
-
-# BUILDDEPS =
-# LIBDEPS =
-
-HOME_URL = http://www.gnu.org/software/gnutrition
-DESCRIPTION = Free nutrition analysis software
+PATCHFILES = fix-install.diff
+
+BUILDDEPS =
+LIBDEPS =
+
+######################################################################
include ../../gar.lib/auto.mk
+include config.mk
=== added file 'gnu/gnutrition/config.mk'
--- a/gnu/gnutrition/config.mk 1970-01-01 00:00:00 +0000
+++ b/gnu/gnutrition/config.mk 2012-11-10 11:49:18 +0000
@@ -0,0 +1,4 @@
+## Configuration options for gnutrition ##
+
+CONFIGURE_OPTS ?=
+BUILD_OPTS ?=
=== added directory 'gnu/gnutrition/files'
=== added file 'gnu/gnutrition/files/fix-install.diff'
--- a/gnu/gnutrition/files/fix-install.diff 1970-01-01 00:00:00 +0000
+++ b/gnu/gnutrition/files/fix-install.diff 2012-11-10 11:49:18 +0000
@@ -0,0 +1,178 @@
+diff -x config.log -x config.status -ru work/gnutrition-0.32/Makefile.in
work/gnutrition-0.32/Makefile.in
+--- work/gnutrition-0.32/Makefile.in 2012-09-01 18:43:08.000000000 +0200
++++ work/gnutrition-0.32/Makefile.in 2012-11-10 12:44:17.391575616 +0100
+@@ -15,6 +15,7 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+
++DESTDIR =
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ bindir = @bindir@
+@@ -41,14 +42,14 @@
+ for dir in $(SUBDIRS); do \
+ ${MAKE} -C $$dir install; \
+ done
+- mkdir -p ${bindir}
+- ${INSTALL} run-gnutrition.py ${bindir}/gnutrition
+- mkdir -p ${prefix}/gnome/apps/Applications/
+- ${INSTALL} -m 644 gnutrition.desktop ${prefix}/gnome/apps/Applications/
++ mkdir -p $(DESTDIR)${bindir}
++ ${INSTALL} run-gnutrition.py $(DESTDIR)${bindir}/gnutrition
++ mkdir -p $(DESTDIR)${prefix}/gnome/apps/Applications/
++ ${INSTALL} -m 644 gnutrition.desktop
$(DESTDIR)${prefix}/gnome/apps/Applications/
+
+ mkinstalldirs:
+- mkdir -p ${bindir}
+- mkdir -p ${datadir}
++ mkdir -p $(DESTDIR)${bindir}
++ mkdir -p $(DESTDIR)${datadir}
+
+ clean:
+ for dir in $(SUBDIRS); do \
+diff -x config.log -x config.status -ru work/gnutrition-0.32/data/Makefile.in
work/gnutrition-0.32/data/Makefile.in
+--- work/gnutrition-0.32/data/Makefile.in 2012-09-01 18:43:08.000000000
+0200
++++ work/gnutrition-0.32/data/Makefile.in 2012-11-10 12:44:45.514914056
+0100
+@@ -15,6 +15,7 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+
++DESTDIR =
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ bindir = @bindir@
+@@ -27,8 +28,8 @@
+ all:
+
+ install: data_prep
+- mkdir -p ${datadir}/data
+- ${INSTALL} -m 644 -c *.txt ${datadir}/data
++ mkdir -p $(DESTDIR)${datadir}/data
++ ${INSTALL} -m 644 -c *.txt $(DESTDIR)${datadir}/data
+
+ data_prep:
+ ./prep_data_files.sh *.txt
+diff -x config.log -x config.status -ru work/gnutrition-0.32/doc/Makefile.in
work/gnutrition-0.32/doc/Makefile.in
+--- work/gnutrition-0.32/doc/Makefile.in 2012-09-01 18:43:08.000000000
+0200
++++ work/gnutrition-0.32/doc/Makefile.in 2012-11-10 12:46:02.988261395
+0100
+@@ -17,6 +17,7 @@
+ # You should have received a copy of the GNU General Public License
+ # along with GNUtrition. If not, see <http://www.gnu.org/licenses/>.
+
++DESTDIR =
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ bindir = @bindir@
+@@ -40,15 +41,15 @@
+ rm -rf gnutrition.junk
+
+ install: gnutrition/book1.html
+- mkdir -p $(docdir)/stylesheet-images
+- ${INSTALL} -m 644 $(imagefiles) $(docdir)
++ mkdir -p $(DESTDIR)$(docdir)/stylesheet-images
++ ${INSTALL} -m 644 $(DESTDIR)$(imagefiles) $(docdir)
+ for i in gnutrition/*.html ; do \
+- ${INSTALL} -m 644 $$i $(docdir) ; \
++ ${INSTALL} -m 644 $$i $(DESTDIR)$(docdir) ; \
+ done
+ for i in gnutrition/stylesheet-images/*.gif ; do \
+- ${INSTALL} -m 644 $$i $(docdir)/stylesheet-images ; \
++ ${INSTALL} -m 644 $$i $(DESTDIR)$(docdir)/stylesheet-images ; \
+ done
+- ${INSTALL} -m 644 topic.dat $(docdir)
++ ${INSTALL} -m 644 topic.dat $(DESTDIR)$(docdir)
+
+ uninstall:
+
+diff -x config.log -x config.status -ru work/gnutrition-0.32/intl/Makefile
work/gnutrition-0.32/intl/Makefile
+--- work/gnutrition-0.32/intl/Makefile 2012-09-01 18:43:08.000000000 +0200
++++ work/gnutrition-0.32/intl/Makefile 2012-11-10 12:42:42.554891328 +0100
+@@ -15,6 +15,7 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+
++DESTDIR =
+ PACKAGE = gnutrition
+ VERSION = 0.1
+
+@@ -113,26 +114,26 @@
+ if test "$(PACKAGE)" = "gettext" \
+ && test '' = '$(GETTOBJS)'; then \
+ if test -r $(MKINSTALLDIRS); then \
+- $(MKINSTALLDIRS) $(libdir) $(includedir); \
++ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
+ else \
+- $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
$(DESTDIR)$(includedir); \
+ fi; \
+- $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
+- $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
++ $(INSTALL_DATA) intlh.inst $(DESTDIR)$(includedir)/libintl.h; \
++ $(INSTALL_DATA) libintl.a $(DESTDIR)$(libdir)/libintl.a; \
+ else \
+ : ; \
+ fi
+ install-data: all
+ if test "$(PACKAGE)" = "gettext"; then \
+ if test -r $(MKINSTALLDIRS); then \
+- $(MKINSTALLDIRS) $(gettextsrcdir); \
++ $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
+ else \
+- $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
+ fi; \
+- $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \
++ $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
+ dists="$(DISTFILES.common)"; \
+ for file in $$dists; do \
+- $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \
++ $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(gettextsrcdir)/$$file;
\
+ done; \
+ else \
+ : ; \
+diff -x config.log -x config.status -ru work/gnutrition-0.32/intl/Makefile.in
work/gnutrition-0.32/intl/Makefile.in
+--- work/gnutrition-0.32/intl/Makefile.in 2012-09-01 18:43:08.000000000
+0200
++++ work/gnutrition-0.32/intl/Makefile.in 2012-11-10 12:47:20.914942359
+0100
+@@ -14,6 +14,7 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+
++DESTDIR =
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+
+@@ -113,26 +114,26 @@
+ if test "$(PACKAGE)" = "gettext" \
+ && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
+ if test -r $(MKINSTALLDIRS); then \
+- $(MKINSTALLDIRS) $(libdir) $(includedir); \
++ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
+ else \
+- $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
$(DESTDIR)$(includedir); \
+ fi; \
+- $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
+- $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
++ $(INSTALL_DATA) intlh.inst $(DESTDIR)$(includedir)/libintl.h; \
++ $(INSTALL_DATA) libintl.a $(DESTDIR)$(libdir)/libintl.a; \
+ else \
+ : ; \
+ fi
+ install-data: all
+ if test "$(PACKAGE)" = "gettext"; then \
+ if test -r $(MKINSTALLDIRS); then \
+- $(MKINSTALLDIRS) $(gettextsrcdir); \
++ $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
+ else \
+- $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
+ fi; \
+- $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \
++ $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
+ dists="$(DISTFILES.common)"; \
+ for file in $$dists; do \
+- $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \
++ $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(gettextsrcdir)/$$file;
\
+ done; \
+ else \
+ : ; \
=== modified file 'gnu/gnutrition/sha256sums'
--- a/gnu/gnutrition/sha256sums 2012-09-01 22:33:11 +0000
+++ b/gnu/gnutrition/sha256sums 2012-11-10 11:49:18 +0000
@@ -1,2 +1,3 @@
8c8b552787800efd7c29e9afc8528483fb34a4cc69f6758a2872be6354faf19e
download/gnutrition-0.32.tar.gz
+03322f16e07e1299ba40a4d7760f511a362d63076d5785b801d050645a7ca4eb
download/fix-install.diff
cc3066d3cba39996af1c59fa9d72c32dfedf835d120f90cd3a79a444c751fbdc
download/gnutrition-0.32.tar.gz.sig
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gsrc-commit] /srv/bzr/gsrc/trunk r1093: clean up gnutrition and fix install,
Brandon Invergo <=