Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes to make it compilable in recent Cygwin environment #134

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+14 −4
Open

Changes to make it compilable in recent Cygwin environment #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d447bfe
Update configure.ac
h0ly0ne Apr 22, 2024
d00fa52
Update Makefile.am
h0ly0ne Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ AC_PREFIX_DEFAULT(/usr/local)

# Automake boilerplate.
AC_CANONICAL_HOST
case "$host_os" in
*cygwin*) CYGWIN=yes;;
*) CYGWIN=no;;
esac

# create a config.h file (Automake will add -DHAVE_CONFIG_H)
AC_CONFIG_HEADERS([config.h])
Expand Down Expand Up @@ -80,7 +84,13 @@ AC_CHECK_FUNCS(select strerror strncpy memcpy strlcpy strlcat)
AC_SUBST(BUNDLE_HOST)
AC_SUBST(DYN_LIB_EXT)
BUNDLE_HOST=`uname | sed -e s,/,_,`
DYN_LIB_EXT="so"

if test "$CYGWIN" = yes ; then
DYN_LIB_EXT="la"
else
DYN_LIB_EXT="so"
fi

AS_CASE([$BUNDLE_HOST],
[Darwin], [BUNDLE_HOST=MacOS DYN_LIB_EXT="dylib"],
[SunOS], [BUNDLE_HOST=Solaris])
Expand Down
6 changes: 3 additions & 3 deletions src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ install_ccid: libccid.la Info.plist
install_ccidtwin: libccidtwin.la
$(mkinstalldirs) "$(DESTDIR)$(ccidtwindir)"
cp .libs/$(CCIDTWIN_LIB) "$(DESTDIR)$(ccidtwindir)/$(CCIDTWIN_LIB)"
$(mkinstalldirs) "$(DESTDIR)/$(serialconfdir)" ; \
perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print" $(srcdir)/reader.conf.in > "$(DESTDIR)/$(serialconfdir)/libccidtwin"
$(mkinstalldirs) "$(serialconfdir)" ; \
perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print" $(srcdir)/reader.conf.in > "$(serialconfdir)/libccidtwin"

# do not uninstall the serial driver by default
# use explicitly 'make uninstall_ccidtwin'
Expand All @@ -109,5 +109,5 @@ uninstall_ccid:

uninstall_ccidtwin:
rm -f "$(DESTDIR)$(ccidtwindir)/$(CCIDTWIN_LIB)"
rm -f "$(DESTDIR)/$(serialconfdir)/libccidtwin"
rm -f "$(serialconfdir)/libccidtwin"

Loading