Fixing libdir configuration

This commit is contained in:
Fabio Manganiello 2022-01-25 20:30:15 +01:00
parent 1d3d7d84f7
commit 84e6c47ae0
7 changed files with 25 additions and 102 deletions

4
.gitignore vendored
View file

@ -66,6 +66,8 @@ config.status
depcomp
install-sh
missing
config.h.in
config.h.in.in
Makefile.in
Makefile.in.in
Makefile
@ -75,4 +77,4 @@ intltool-update.in
libtool
.deps/
.libs/
stamp-h1

View file

@ -6,5 +6,6 @@ EXTRA_DIST = \
intltool-update.in
install-exec-hook:
rm -f $(DESTDIR)$(LXPANEL_LIBDIR)/plugins/*.la
rm -f $(DESTDIR)$(LXPANEL_LIBDIR)/plugins/*.a
rm -f $(LXPANEL_LIBDIR)/plugins/cutiepi_battery.la
rm -f $(LXPANEL_LIBDIR)/plugins/cutiepi_battery.a
rm -f $(LXPANEL_LIBDIR)/plugins/cutiepi_battery.so

1
README Symbolic link
View file

@ -0,0 +1 @@
README.md

View file

@ -1,2 +1,11 @@
# cutiepi-lxpanel-battery
lxpanel plugin for the CutiePi battery
## Installation from sources
```shell
$ sudo apt install \
build-essential autoconf automake libtool intltool \
libglib2.0-dev libgtk2.0-dev lxpanel-dev
```

View file

@ -1,92 +0,0 @@
/* config.h.in. Generated from configure.ac by autoheader. */
/* always defined to indicate that i18n is enabled */
#undef ENABLE_NLS
/* Gettext package. */
#undef GETTEXT_PACKAGE
/* Define to 1 if you have the `bind_textdomain_codeset' function. */
#undef HAVE_BIND_TEXTDOMAIN_CODESET
/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
CoreFoundation framework. */
#undef HAVE_CFLOCALECOPYCURRENT
/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
the CoreFoundation framework. */
#undef HAVE_CFPREFERENCESCOPYAPPVALUE
/* Define to 1 if you have the `dcgettext' function. */
#undef HAVE_DCGETTEXT
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* Define if the GNU gettext() function is already present or preinstalled. */
#undef HAVE_GETTEXT
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define if your <locale.h> file defines LC_MESSAGES. */
#undef HAVE_LC_MESSAGES
/* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define to 1 if you have the <stdio.h> header file. */
#undef HAVE_STDIO_H
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Name of package */
#undef PACKAGE
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
/* Define to the full name of this package. */
#undef PACKAGE_NAME
/* Define to the full name and version of this package. */
#undef PACKAGE_STRING
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the home page for this package. */
#undef PACKAGE_URL
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* Define to 1 if all of the C90 standard headers exist (not just the ones
required in a freestanding environment). This macro is provided for
backward compatibility; new code need not use it. */
#undef STDC_HEADERS
/* Version number of package */
#undef VERSION

View file

@ -1,11 +1,12 @@
AC_PREREQ([2.71])
AC_PREREQ([2.69])
AC_INIT([lxpanel-cutiepi-battery],[0.1])
AM_INIT_AUTOMAKE
AM_MAINTAINER_MODE
LT_INIT
AC_PROG_CC
AC_PROG_INSTALL
LT_INIT
AC_CONFIG_HEADERS([config.h.in])
# Checks for libraries.
pkg_modules="glib-2.0 >= 2.6.0 \
@ -17,11 +18,12 @@ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
prefix=$(pkg-config --variable=prefix lxpanel)
LXPANEL_LIBDIR=$(pkg-config --variable=libdir lxpanel)/lxpanel
LXPANEL_DATADIR=$(pkg-config --variable=datadir lxpanel)/lxpanel
#prefix=$(pkg-config --variable=prefix lxpanel)
LXPANEL_LIBDIR=$(pkg-config --variable=pkglibdir lxpanel)
LXPANEL_PLUGINSDIR=$(pkg-config --variable=pluginsdir lxpanel)
AC_SUBST(LXPANEL_LIBDIR)
AC_SUBST(LXPANEL_DATADIR)
prefix=$LXPANEL_LIBDIR
libdir=$LXPANEL_PLUGINSDIR
LXPANEL_CPPFLAGS=$(pkg-config --cflags --libs lxpanel)
AC_SUBST(LXPANEL_CPPFLAGS)

View file

@ -7,7 +7,7 @@ AM_CPPFLAGS = \
module_LTLIBRARIES = cutiepi_battery.la
moduledir = $(libdir)/lxpanel/plugins
moduledir = $(libdir)
cutiepi_battery_la_SOURCES = \
main.c