Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

  • Loading branch information...
commit 961059a05285921c5431a8a2d8b86a164c12da0e 1 parent 58b4304
viktorTarasov authored
10 etc/Makefile.am
... ... @@ -1,10 +1,12 @@
1   -MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
2   -DISTCLEANFILES = opensc.conf
  1 +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/opensc.conf.win
  2 +DISTCLEANFILES = opensc.conf opensc.conf.win
  3 +
  4 +EXTRA_DIST = Makefile.mak
3 5
4 6 SUFFIXES = .in
5 7
6   -dist_noinst_DATA = opensc.conf.in
7   -nodist_noinst_DATA = opensc.conf # For Windows MSVC build
  8 +dist_noinst_DATA = opensc.conf.in opensc.conf.win.in
  9 +nodist_noinst_DATA = opensc.conf opensc.conf.win # For Windows MSVC build
8 10
9 11 # Make sure we build this every time
10 12 # as there is no dependency for this.
6 win32/Makefile.am
... ... @@ -1,8 +1,8 @@
1   -MAINTAINERCLEANFILES = $(srcdir)/Makefile.in \
2   - $(srcdir)/versioninfo.rc $(srcdir)/winconfig.h
  1 +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/versioninfo.rc $(srcdir)/winconfig.h \
  2 + $(srcdir)/OpenSC.iss $(srcdir)/OpenSC.wxs $(srcdir)/OpenSC.ico $(srcdir)/license.rtf
3 3 EXTRA_DIST = ltrc.inc Makefile.mak Make.rules.mak opensc-install.bat \
4 4 versioninfo.rc.in winconfig.h.in OpenSC.iss.in OpenSC.wxs.in
5   -dist_noinst_HEADERS = versioninfo.rc winconfig.h
  5 +dist_noinst_HEADERS = versioninfo.rc winconfig.h OpenSC.iss OpenSC.wxs license.rtf OpenSC.ico
6 6
7 7 if WIN32
8 8 sbin_SCRIPTS = opensc-install.bat
8 win32/winconfig.h.in
@@ -29,7 +29,7 @@
29 29
30 30 #ifndef strnicmp
31 31 #define strnicmp _strnicmp
32   -#endif
  32 +#endif
33 33
34 34 #ifndef stricmp
35 35 #define stricmp _stricmp
@@ -66,11 +66,11 @@
66 66 #define F_OK 0 /* test whether exist. */
67 67 #endif
68 68
69   -#ifndef S_IRUSR
  69 +#ifndef S_IRUSR
70 70 #define S_IRUSR S_IREAD
71 71 #endif
72 72
73   -#ifndef S_IWUSR
  73 +#ifndef S_IWUSR
74 74 #define S_IWUSR S_IWRITE
75 75 #endif
76 76
@@ -79,7 +79,7 @@
79 79 #define HAVE_WINSCARD_H
80 80 #define DEFAULT_PCSC_PROVIDER "winscard.dll"
81 81
82   -#define SC_PKCS15_PROFILE_DIRECTORY "C:\\Program Files\\OpenSC\\profiles"
  82 +#define SC_PKCS15_PROFILE_DIRECTORY "C:\\Program Files\\OpenSC Project\\OpenSC\\profiles"
83 83
84 84 #define PATH_MAX FILENAME_MAX
85 85

0 comments on commit 961059a

Please sign in to comment.
Something went wrong with that request. Please try again.