Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb49681' into 'master'
Specify libdir.

See merge request mer-core/libglibutil!4
  • Loading branch information
monich committed May 22, 2020
2 parents e8f82c1 + 66adcce commit 4cb5475
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Makefile
Expand Up @@ -234,9 +234,9 @@ INSTALL = install
INSTALL_DIRS = $(INSTALL) -d
INSTALL_FILES = $(INSTALL) -m $(INSTALL_PERM)

INSTALL_LIB_DIR = $(DESTDIR)/usr/lib
INSTALL_LIB_DIR = $(DESTDIR)$(libdir)
INSTALL_INCLUDE_DIR = $(DESTDIR)/usr/include/gutil
INSTALL_PKGCONFIG_DIR = $(DESTDIR)/usr/lib/pkgconfig
INSTALL_PKGCONFIG_DIR = $(DESTDIR)$(libdir)/pkgconfig

install: $(INSTALL_LIB_DIR)
$(INSTALL_FILES) $(RELEASE_LIB) $(INSTALL_LIB_DIR)
Expand Down
4 changes: 2 additions & 2 deletions rpm/libglibutil.spec
Expand Up @@ -25,11 +25,11 @@ This package contains the development library for %{name}.
%setup -q

%build
make KEEP_SYMBOLS=1 release pkgconfig
make libdir=%{_libdir} KEEP_SYMBOLS=1 release pkgconfig

%install
rm -rf %{buildroot}
make install-dev DESTDIR=%{buildroot}
make libdir=%{_libdir} install-dev DESTDIR=%{buildroot}

%check
make -C test test
Expand Down

0 comments on commit 4cb5475

Please sign in to comment.