Skip to content

Commit

Permalink
Install data files to /usr/share/libcups3.
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelrsweet committed Feb 9, 2023
1 parent eb90154 commit b762ec5
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.git* export-ignore
.mailmap export-ignore
examples/testfile.pcl -text
exampels/testfile.txt -text
examples/testfile.txt -text
scripts export-ignore
4 changes: 2 additions & 2 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -5570,9 +5570,9 @@ fi
fi


CUPS_DATADIR="$datadir/cups"
CUPS_DATADIR="$datadir/libcups3"

printf "%s\n" "#define CUPS_DATADIR \"$datadir/cups\"" >>confdefs.h
printf "%s\n" "#define CUPS_DATADIR \"$datadir/libcups3\"" >>confdefs.h



Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -613,8 +613,8 @@ AS_IF([test "$sysconfdir" = "\${prefix}/etc"], [


dnl CUPS_DATADIR and CUPS_SERVERROOT
CUPS_DATADIR="$datadir/cups"
AC_DEFINE_UNQUOTED([CUPS_DATADIR], ["$datadir/cups"], [Location of data files.])
CUPS_DATADIR="$datadir/libcups3"
AC_DEFINE_UNQUOTED([CUPS_DATADIR], ["$datadir/libcups3"], [Location of data files.])
AC_SUBST([CUPS_DATADIR])

CUPS_SERVERROOT="$sysconfdir/cups"
Expand Down
6 changes: 3 additions & 3 deletions packaging/libcups3.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ rm -rf $RPM_BUILD_ROOT

/usr/lib/libcups3.so.3

%dir /usr/share/cups
%dir /usr/share/cups/ipptool
/usr/share/cups/ipptool/*
%dir /usr/share/libcups3
%dir /usr/share/libcups3/ipptool
/usr/share/libcups3/ipptool/*

%dir /usr/share/doc/libcups3
/usr/share/doc/libcups3/ipp*.html
Expand Down

0 comments on commit b762ec5

Please sign in to comment.