[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 15/19: remove superfluous endif from merge



This is an automated email from the git hooks/post-receive script.

sweetshark-guest pushed a commit to branch ubuntu-utopic-4.3
in repository libreoffice.

commit d15c9853aa154af4f581dde2fd2bc04e0055ab3b
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Mon Aug 11 21:49:45 2014 +0200

    remove superfluous endif from merge
---
 rules | 2 --
 1 file changed, 2 deletions(-)

diff --git a/rules b/rules
index 2de2d72..e75b173 100755
--- a/rules
+++ b/rules
@@ -1356,7 +1356,6 @@ ifeq "$(ENABLE_FIREBIRD)" "y"
 else
 	CONFIGURE_FLAGS += --disable-firebird-sdbc
 endif
-endif
 
 ifeq "$(BUILD_GTK)" "n"
 	CONFIGURE_FLAGS+= --disable-gtk
@@ -2676,7 +2675,6 @@ ifeq "$(ENABLE_FIREBIRD)" "y"
 	mkdir -p $(PKGDIR)-sdbc-firebird/$(OODIR)/program
 	mv $(PKGDIR)-base/$(OODIR)/program/libfirebird_sdbclo.so \
 		$(PKGDIR)-sdbc-firebird/$(OODIR)/program
-endif
 	mkdir -p $(PKGDIR)-base-drivers/$(OODIR)/program
 	for i in `find $(PKGDIR)-base/$(OODIR)/program/ -name "*.so" \
 		-a \! -name "libdbulo*" -a \! -name "libdbaxml*" -a \! -name "libdbp*" -a \! -name "libabplo.so"`; do \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git


Reply to: