From: Elan Ruusamäe Date: Sat, 27 Apr 2013 14:09:57 +0000 (+0300) Subject: fix install in lib64 systems X-Git-Tag: auto/th/libdom-0.0.1-1~1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Flibdom.git;a=commitdiff_plain;h=506b66013dd327ad0b7fd78e4612b53a438de727 fix install in lib64 systems --- diff --git a/lib.patch b/lib.patch new file mode 100644 index 0000000..d0b38f0 --- /dev/null +++ b/lib.patch @@ -0,0 +1,21 @@ +--- libdom-0.0.1/Makefile~ 2013-04-18 19:18:13.000000000 +0300 ++++ libdom-0.0.1/Makefile 2013-04-27 17:09:02.471130386 +0300 +@@ -77,6 +77,7 @@ + INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/event_listener.h + INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/document_event.h + ++lib := lib + Is := include/dom/html + I := /include/dom/html + INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_document.h +@@ -97,8 +98,8 @@ + INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_opt_group_element.h + INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_options_collection.h + +-INSTALL_ITEMS := $(INSTALL_ITEMS) /lib/pkgconfig:lib$(COMPONENT).pc.in +-INSTALL_ITEMS := $(INSTALL_ITEMS) /lib:$(OUTPUT) ++INSTALL_ITEMS := $(INSTALL_ITEMS) /$(lib)/pkgconfig:lib$(COMPONENT).pc.in ++INSTALL_ITEMS := $(INSTALL_ITEMS) /$(lib):$(OUTPUT) + + ifeq ($(WITH_LIBXML_BINDING),yes) + REQUIRED_PKGS := $(REQUIRED_PKGS) libxml-2.0 diff --git a/libdom.spec b/libdom.spec index 5754a1e..e7d3a16 100644 --- a/libdom.spec +++ b/libdom.spec @@ -10,6 +10,7 @@ License: MIT Group: Libraries Source0: http://download.netsurf-browser.org/libs/releases/%{name}-%{version}-src.tar.gz # Source0-md5: dea386cfe4fc65b79a1815b0515fc688 +Patch0: lib.patch URL: http://www.netsurf-browser.org/projects/libdom/ BuildRequires: libhubbub-devel >= 0.2.0 BuildRequires: libparserutils-devel >= 0.1.2 @@ -51,6 +52,7 @@ Statyczna biblioteka libdom. %prep %setup -q +%patch0 -p1 %build export CC="%{__cc}" @@ -70,12 +72,14 @@ export LDFLAGS="%{rpmldflags}" %install rm -rf $RPM_BUILD_ROOT %{__make} install Q= \ + lib=%{_lib} \ PREFIX=%{_prefix} \ COMPONENT_TYPE=lib-shared \ DESTDIR=$RPM_BUILD_ROOT %if %{with static_libs} %{__make} install Q= \ + lib=%{_lib} \ PREFIX=%{_prefix} \ COMPONENT_TYPE=lib-static \ DESTDIR=$RPM_BUILD_ROOT