[MERGED] openbsc[master]: debian: Install header and source file to different directory

Holger Freyther gerrit-no-reply at lists.osmocom.org
Tue Jan 24 13:16:10 UTC 2017


Holger Freyther has submitted this change and it was merged.

Change subject: debian: Install header and source file to different directory
......................................................................


debian: Install header and source file to different directory

osmo-bts consumes the gsm_data_shared.{h,c} files and assumes the
OpenBSC directory layout. Install the files into the specific
sub-directories to make the --with-openbsc=dir option work.

Change-Id: I3da21402dee3d6f1d812b232b0a3f13b8a462d5b
---
M debian/control
M debian/openbsc-dev.install
2 files changed, 5 insertions(+), 4 deletions(-)

Approvals:
  Max: Looks good to me, but someone else must approve
  Jenkins Builder: Verified
  Holger Freyther: Looks good to me, approved



diff --git a/debian/control b/debian/control
index 93b4bd3..144e649 100644
--- a/debian/control
+++ b/debian/control
@@ -107,8 +107,8 @@
  from OpenBSC. This package installs these files to your file system so
  that the other packages can build-depend on this package.
  .
- The header file is installed to /usr/include/osmocom/openbsc, while
- the .c file is installed to /usr/src/osmocom/openbsc.
+ The directory structure is copied after the structure in the repository
+ and the header and .c file are installed into /usr/src/osmocom/openbsc/.
 
 Package: osmo-gtphub
 Architecture: any
diff --git a/debian/openbsc-dev.install b/debian/openbsc-dev.install
index 557aea1..398321a 100644
--- a/debian/openbsc-dev.install
+++ b/debian/openbsc-dev.install
@@ -1,2 +1,3 @@
-openbsc/include/openbsc/gsm_data_shared.h usr/include/osmocom/openbsc/
-openbsc/src/libcommon/gsm_data_shared.c usr/src/osmocom/openbsc/libcommon/
+openbsc/include/openbsc/gsm_data_shared.h usr/src/osmocom/openbsc/openbsc/include/openbsc/
+openbsc/include/openbsc/common_cs.h usr/src/osmocom/openbsc/openbsc/include/openbsc/
+openbsc/src/libcommon/gsm_data_shared.c usr/src/osmocom/openbsc/openbsc/src/libcommon/

-- 
To view, visit https://gerrit.osmocom.org/1651
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3da21402dee3d6f1d812b232b0a3f13b8a462d5b
Gerrit-PatchSet: 3
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Holger Freyther <holger at freyther.de>
Gerrit-Reviewer: Holger Freyther <holger at freyther.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max <msuraev at sysmocom.de>


More information about the gerrit-log mailing list