Date: Wednesday, November 22, 2006 @ 11:55:11
Author: csaba
Path: /cvsroot/carob/libmysequoia
Modified: Makefile.am (1.11 -> 1.12) debian/rules (1.7 -> 1.8)
libmysequoia.spec (1.21 -> 1.22)
Let the packager decide where he want to install the documentation.
-------------------+
Makefile.am | 3 ---
debian/rules | 5 ++---
libmysequoia.spec | 4 ++++
3 files changed, 6 insertions(+), 6 deletions(-)
Index: libmysequoia/Makefile.am
diff -u libmysequoia/Makefile.am:1.11 libmysequoia/Makefile.am:1.12
--- libmysequoia/Makefile.am:1.11 Mon Mar 27 11:52:38 2006
+++ libmysequoia/Makefile.am Wed Nov 22 11:55:11 2006
@@ -89,9 +89,6 @@
$(INSTALL_DATA) -D $(srcdir)/config/logger.conf
$(DESTDIR)$(sysconfdir)/logger.conf
$(INSTALL_DATA) -D $(srcdir)/config/mysequoia.conf
$(DESTDIR)$(sysconfdir)/mysequoia.conf
$(INSTALL_SCRIPT) -D $(srcdir)/config/mysequoia_config
$(DESTDIR)$(bindir)/mysequoia_config
- $(INSTALL_DATA) -D $(srcdir)/NEWS
$(DESTDIR)$(datadir)/doc/$(PACKAGE)/NEWS
- $(INSTALL_DATA) -D $(srcdir)/README
$(DESTDIR)$(datadir)/doc/$(PACKAGE)/README
- $(INSTALL_DATA) -D $(srcdir)/COPYING
$(DESTDIR)$(datadir)/doc/$(PACKAGE)/COPYING
clean-local:
rm -rf $(DOC_OUT_HTML) $(DOC_OUT_PDF) $(LCOV_TMP) $(LCOV_HTML)
Index: libmysequoia/debian/rules
diff -u libmysequoia/debian/rules:1.7 libmysequoia/debian/rules:1.8
--- libmysequoia/debian/rules:1.7 Wed Feb 22 10:18:16 2006
+++ libmysequoia/debian/rules Wed Nov 22 11:55:11 2006
@@ -9,13 +9,11 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -74,7 +72,8 @@
# Add here commands to install the package into debian/tmp
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
+ install -d -m 755 $(CURDIR)/debian/tmp/usr/share/doc/libmysequoia
+ install -m 644 NEWS README COPYING
$(CURDIR)/debian/tmp/usr/share/doc/libmysequoia
# Build architecture-independent files here.
binary-indep: build install
Index: libmysequoia/libmysequoia.spec
diff -u libmysequoia/libmysequoia.spec:1.21 libmysequoia/libmysequoia.spec:1.22
--- libmysequoia/libmysequoia.spec:1.21 Tue Nov 21 11:11:13 2006
+++ libmysequoia/libmysequoia.spec Wed Nov 22 11:55:11 2006
@@ -41,9 +41,13 @@
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
+
install -d -m 0755 $RPM_BUILD_ROOT/etc/ld.so.conf.d
echo "%{_libdir}/mysequoia" >
$RPM_BUILD_ROOT/etc/ld.so.conf.d/mysequoia-i386.conf
+install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}
+install -m 644 NEWS README COPYING $RPM_BUILD_ROOT%{_docdir}/%{name}
+
%clean
rm -rf $RPM_BUILD_ROOT
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
