Permalink
Browse files

build: include to 'dist' the files used by Windows build

  • Loading branch information...
viktorTarasov committed Sep 11, 2012
1 parent 58b4304 commit 961059a05285921c5431a8a2d8b86a164c12da0e
Showing with 13 additions and 11 deletions.
  1. +6 −4 etc/Makefile.am
  2. +3 −3 win32/Makefile.am
  3. +4 −4 win32/winconfig.h.in
View
@@ -1,10 +1,12 @@
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-DISTCLEANFILES = opensc.conf
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/opensc.conf.win
+DISTCLEANFILES = opensc.conf opensc.conf.win
+
+EXTRA_DIST = Makefile.mak
SUFFIXES = .in
-dist_noinst_DATA = opensc.conf.in
-nodist_noinst_DATA = opensc.conf # For Windows MSVC build
+dist_noinst_DATA = opensc.conf.in opensc.conf.win.in
+nodist_noinst_DATA = opensc.conf opensc.conf.win # For Windows MSVC build
# Make sure we build this every time
# as there is no dependency for this.
View
@@ -1,8 +1,8 @@
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in \
- $(srcdir)/versioninfo.rc $(srcdir)/winconfig.h
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/versioninfo.rc $(srcdir)/winconfig.h \
+ $(srcdir)/OpenSC.iss $(srcdir)/OpenSC.wxs $(srcdir)/OpenSC.ico $(srcdir)/license.rtf
EXTRA_DIST = ltrc.inc Makefile.mak Make.rules.mak opensc-install.bat \
versioninfo.rc.in winconfig.h.in OpenSC.iss.in OpenSC.wxs.in
-dist_noinst_HEADERS = versioninfo.rc winconfig.h
+dist_noinst_HEADERS = versioninfo.rc winconfig.h OpenSC.iss OpenSC.wxs license.rtf OpenSC.ico
if WIN32
sbin_SCRIPTS = opensc-install.bat
View
@@ -29,7 +29,7 @@
#ifndef strnicmp
#define strnicmp _strnicmp
-#endif
+#endif
#ifndef stricmp
#define stricmp _stricmp
@@ -66,11 +66,11 @@
#define F_OK 0 /* test whether exist. */
#endif
-#ifndef S_IRUSR
+#ifndef S_IRUSR
#define S_IRUSR S_IREAD
#endif
-#ifndef S_IWUSR
+#ifndef S_IWUSR
#define S_IWUSR S_IWRITE
#endif
@@ -79,7 +79,7 @@
#define HAVE_WINSCARD_H
#define DEFAULT_PCSC_PROVIDER "winscard.dll"
-#define SC_PKCS15_PROFILE_DIRECTORY "C:\\Program Files\\OpenSC\\profiles"
+#define SC_PKCS15_PROFILE_DIRECTORY "C:\\Program Files\\OpenSC Project\\OpenSC\\profiles"
#define PATH_MAX FILENAME_MAX

0 comments on commit 961059a

Please sign in to comment.