|
 |
6f51e1 |
From a1c4718d9db069ab088914ec983af8125eba3ac6 Mon Sep 17 00:00:00 2001
|
|
|
6f51e1 |
From: Mark Reynolds <mreynolds@redhat.com>
|
|
|
6f51e1 |
Date: Fri, 31 Mar 2017 09:34:27 -0400
|
|
|
6f51e1 |
Subject: [PATCH] Issue 49177 - Fix pkg-config file
|
|
|
6f51e1 |
|
|
|
6f51e1 |
Description: Need to remove the slash in front of the package name
|
|
|
6f51e1 |
|
|
|
6f51e1 |
https://pagure.io/389-ds-base/issue/49177
|
|
|
6f51e1 |
|
|
|
6f51e1 |
Reviewed by: lslebodn & wibrown (Thanks!!)
|
|
|
6f51e1 |
---
|
|
|
6f51e1 |
Makefile.am | 4 ++--
|
|
|
6f51e1 |
configure.ac | 4 ++--
|
|
|
6f51e1 |
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
6f51e1 |
|
|
|
6f51e1 |
diff --git a/Makefile.am b/Makefile.am
|
|
|
6f51e1 |
index 982dd28..485a460 100644
|
|
|
6f51e1 |
--- a/Makefile.am
|
|
|
6f51e1 |
+++ b/Makefile.am
|
|
|
6f51e1 |
@@ -261,7 +261,7 @@ sampledatadir = $(datadir)@sampledatadir@
|
|
|
6f51e1 |
systemschemadir = $(datadir)@systemschemadir@
|
|
|
6f51e1 |
propertydir = $(datadir)@propertydir@
|
|
|
6f51e1 |
schemadir = $(sysconfdir)@schemadir@
|
|
|
6f51e1 |
-serverdir = $(libdir)@serverdir@
|
|
|
6f51e1 |
+serverdir = $(libdir)/@serverdir@
|
|
|
6f51e1 |
serverplugindir = $(libdir)@serverplugindir@
|
|
|
6f51e1 |
taskdir = $(datadir)@scripttemplatedir@
|
|
|
6f51e1 |
systemdsystemunitdir = @with_systemdsystemunitdir@
|
|
|
6f51e1 |
@@ -276,7 +276,7 @@ infdir = $(datadir)@infdir@
|
|
|
6f51e1 |
mibdir = $(datadir)@mibdir@
|
|
|
6f51e1 |
updatedir = $(datadir)@updatedir@
|
|
|
6f51e1 |
pkgconfigdir = $(libdir)/pkgconfig
|
|
|
6f51e1 |
-serverincdir = $(includedir)@serverincdir@
|
|
|
6f51e1 |
+serverincdir = $(includedir)/@serverincdir@
|
|
|
6f51e1 |
|
|
|
6f51e1 |
defaultuser=@defaultuser@
|
|
|
6f51e1 |
defaultgroup=@defaultgroup@
|
|
|
6f51e1 |
diff --git a/configure.ac b/configure.ac
|
|
|
6f51e1 |
index 8172bab..51c4414 100644
|
|
|
6f51e1 |
--- a/configure.ac
|
|
|
6f51e1 |
+++ b/configure.ac
|
|
|
6f51e1 |
@@ -361,9 +361,9 @@ else
|
|
|
6f51e1 |
# relative to datadir
|
|
|
6f51e1 |
updatedir=/$PACKAGE_NAME/updates
|
|
|
6f51e1 |
# relative to libdir
|
|
|
6f51e1 |
- serverdir=/$PACKAGE_NAME
|
|
|
6f51e1 |
+ serverdir=$PACKAGE_NAME
|
|
|
6f51e1 |
# relative to includedir
|
|
|
6f51e1 |
- serverincdir=/$PACKAGE_NAME
|
|
|
6f51e1 |
+ serverincdir=$PACKAGE_NAME
|
|
|
6f51e1 |
# relative to libdir
|
|
|
6f51e1 |
serverplugindir=/$PACKAGE_NAME/plugins
|
|
|
6f51e1 |
# relative to datadir
|
|
|
6f51e1 |
--
|
|
|
6f51e1 |
2.9.3
|
|
|
6f51e1 |
|