r19519 - /desktop/experimental/gtk+2.0/debian/rules

[lool at users.alioth.debian.org]

Author: lool
Date: Fri Apr 10 19:22:27 2009
New Revision: 19519

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19519
Log:
Move LIBDIR def around to set OPTLIBDIR properly.

Modified:
    desktop/experimental/gtk+2.0/debian/rules

Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=19519&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules (original)
+++ desktop/experimental/gtk+2.0/debian/rules Fri Apr 10 19:22:27 2009
@@ -28,6 +28,22 @@
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_BUILD_GNU_CPU  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+
+# relative libdir
+ifneq (,$(findstring multiarch,$(DEB_BUILD_OPTIONS)))
+LIBDIR := usr/lib/$(DEB_HOST_GNU_TYPE)
+else
+LIBDIR := usr/lib
+endif
+
+# relative base directory for all types of modules
+MODULES_BASE_PATH := $(LIBDIR)/gtk-$(APIVER)/$(GTK_BINARY_VERSION)
+
+# relative directory to store the generated IM module files
+IMMODULE_FILES_D := $(MODULES_BASE_PATH)/immodule-files.d
+
+# relative directory to store the generated GdkPixbuf loader files
+LOADER_FILES_D := $(MODULES_BASE_PATH)/loader-files.d
 
 # ppc64 support; see #386815
 # XXX Should probably be fixed in binutils
@@ -116,22 +132,6 @@
 # targets
 installdir = $(installbasedir)/$(current_flavor)
 installbasedir = $(CURDIR)/debian/install
-
-# relative libdir
-ifneq (,$(findstring multiarch,$(DEB_BUILD_OPTIONS)))
-LIBDIR := usr/lib/$(DEB_HOST_GNU_TYPE)
-else
-LIBDIR := usr/lib
-endif
-
-# relative base directory for all types of modules
-MODULES_BASE_PATH := $(LIBDIR)/gtk-$(APIVER)/$(GTK_BINARY_VERSION)
-
-# relative directory to store the generated IM module files
-IMMODULE_FILES_D := $(MODULES_BASE_PATH)/immodule-files.d
-
-# relative directory to store the generated GdkPixbuf loader files
-LOADER_FILES_D := $(MODULES_BASE_PATH)/loader-files.d
 
 # configure flags
 configure_flags := \