Commit 5b26c4f1b419f77b8de623dd9175aef3ff508662
1 parent
fbc82205
Exists in
master
Fixing package build.
Showing
2 changed files
with
26 additions
and
0 deletions
Show diff stats
Makefile.in
| ... | ... | @@ -70,6 +70,7 @@ datarootdir=@datarootdir@ |
| 70 | 70 | localedir=@localedir@ |
| 71 | 71 | docdir=@docdir@ |
| 72 | 72 | sysconfdir=@sysconfdir@ |
| 73 | +PYTHON_SITELIB=@PYTHON_SITELIB@ | |
| 73 | 74 | |
| 74 | 75 | BASEDIR=@BASEDIR@ |
| 75 | 76 | |
| ... | ... | @@ -157,8 +158,24 @@ $(OBJRLS)/%.o: \ |
| 157 | 158 | |
| 158 | 159 | @echo $< ... |
| 159 | 160 | @$(MKDIR) $(dir $@) |
| 161 | + | |
| 160 | 162 | @$(CXX) \ |
| 163 | + $(CXXFLAGS) \ | |
| 164 | + -Wall -Wextra \ | |
| 165 | + -DNDEBUG=1 \ | |
| 166 | + -o $@ \ | |
| 167 | + -c $< | |
| 168 | + | |
| 169 | +$(OBJRLS)/%.o: \ | |
| 170 | + %.c \ | |
| 171 | + $(DEPENDS) | |
| 172 | + | |
| 173 | + @echo $< ... | |
| 174 | + @$(MKDIR) $(dir $@) | |
| 175 | + | |
| 176 | + @$(CC) \ | |
| 161 | 177 | $(CFLAGS) \ |
| 178 | + -Wall -Wextra \ | |
| 162 | 179 | -DNDEBUG=1 \ |
| 163 | 180 | -o $@ \ |
| 164 | 181 | -c $< |
| ... | ... | @@ -186,6 +203,7 @@ $(BINRLS)/$(LIBNAME)@DLLEXT@: \ |
| 186 | 203 | @$(LD) \ |
| 187 | 204 | -shared -Wl,-soname,$(@F) \ |
| 188 | 205 | -o $@ \ |
| 206 | + -L$(OBJRLS) \ | |
| 189 | 207 | $(LDFLAGS) \ |
| 190 | 208 | $^ \ |
| 191 | 209 | $(LIBS) |
| ... | ... | @@ -195,6 +213,10 @@ $(BINRLS)/$(LIBNAME)@DLLEXT@: \ |
| 195 | 213 | install: \ |
| 196 | 214 | $(BINRLS)/$(LIBNAME)@DLLEXT@ |
| 197 | 215 | |
| 216 | + @echo $(INSTALL_PROGRAM) \ | |
| 217 | + $(BINRLS)/$(LIBNAME)@DLLEXT@) \ | |
| 218 | + $(DESTDIR)$(PYTHON_SITELIB) | |
| 219 | + | |
| 198 | 220 | |
| 199 | 221 | #---[ Debug Targets ]-------------------------------------------------------------------- |
| 200 | 222 | ... | ... |
configure.ac
| ... | ... | @@ -216,6 +216,10 @@ PKG_CHECK_MODULES( [PYTHON], [python3], AC_DEFINE(HAVE_PYTHON3), AC_MSG_ERROR([P |
| 216 | 216 | AC_SUBST(PYTHON_LIBS) |
| 217 | 217 | AC_SUBST(PYTHON_CFLAGS) |
| 218 | 218 | |
| 219 | +AC_ARG_WITH([python-sitelib], [AS_HELP_STRING([--with-python-sitelib], [Set python-sitelib])], [ app_cv_python_sitelib="$withval" ],[ app_cv_python_sitelib=`python3 -c 'import site; print(site.getsitepackages().pop(0))'` ]) | |
| 220 | +AC_DEFINE_UNQUOTED(PYTHON_SITELIB, $app_cv_python_sitelib) | |
| 221 | +AC_SUBST(PYTHON_SITELIB,$app_cv_python_sitelib) | |
| 222 | + | |
| 219 | 223 | dnl --------------------------------------------------------------------------- |
| 220 | 224 | dnl Check for ELF symbol visibility support |
| 221 | 225 | dnl --------------------------------------------------------------------------- | ... | ... |